From 68fc14288753d22fb77cdea3376794814e46ca04 Mon Sep 17 00:00:00 2001
From: wrui <icytail@vip.qq.com>
Date: Wed, 12 Jun 2019 10:26:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=A4=BA=E4=BE=8B=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/controller/DemoDialogController.java |   80 -
 .../demo/controller/DemoFormController.java   |  243 ---
 .../demo/controller/DemoIconController.java   |   35 -
 .../controller/DemoOperateController.java     |  303 ---
 .../demo/controller/DemoReportController.java |   53 -
 .../demo/controller/DemoTableController.java  |  367 ----
 .../demo/domain/UserOperateModel.java         |  147 --
 .../web/controller/tool/TestController.java   |  175 --
 .../templates/demo/form/autocomplete.html     |  322 ---
 .../resources/templates/demo/form/basic.html  |  593 -----
 .../resources/templates/demo/form/button.html |  620 ------
 .../templates/demo/form/datetime.html         |  235 --
 .../templates/demo/form/duallistbox.html      |   60 -
 .../resources/templates/demo/form/grid.html   |  432 ----
 .../resources/templates/demo/form/jasny.html  |  118 -
 .../resources/templates/demo/form/select.html |  259 ---
 .../templates/demo/form/sortable.html         |  198 --
 .../templates/demo/form/tabs_panels.html      |  353 ---
 .../resources/templates/demo/form/upload.html |   55 -
 .../templates/demo/form/validate.html         |  193 --
 .../resources/templates/demo/form/wizard.html |  192 --
 .../templates/demo/icon/fontawesome.html      | 1944 -----------------
 .../templates/demo/icon/glyphicons.html       | 1364 ------------
 .../templates/demo/modal/dialog.html          |  215 --
 .../resources/templates/demo/modal/form.html  |   95 -
 .../resources/templates/demo/modal/layer.html |  245 ---
 .../resources/templates/demo/modal/table.html |   56 -
 .../templates/demo/modal/table/check.html     |   86 -
 .../templates/demo/modal/table/parent.html    |   90 -
 .../templates/demo/modal/table/radio.html     |   86 -
 .../resources/templates/demo/operate/add.html |   78 -
 .../templates/demo/operate/detail.html        |   69 -
 .../templates/demo/operate/edit.html          |   79 -
 .../templates/demo/operate/other.html         |    9 -
 .../templates/demo/operate/table.html         |  123 --
 .../templates/demo/report/echarts.html        | 1494 -------------
 .../templates/demo/report/metrics.html        |  478 ----
 .../templates/demo/report/peity.html          |  206 --
 .../templates/demo/report/sparkline.html      |  232 --
 .../templates/demo/table/button.html          |   92 -
 .../templates/demo/table/detail.html          |   86 -
 .../resources/templates/demo/table/event.html |  107 -
 .../templates/demo/table/export.html          |   80 -
 .../templates/demo/table/fixedColumns.html    |  143 --
 .../templates/demo/table/footer.html          |   83 -
 .../templates/demo/table/groupHeader.html     |   80 -
 .../resources/templates/demo/table/image.html |   80 -
 .../resources/templates/demo/table/multi.html |  150 --
 .../resources/templates/demo/table/other.html |  106 -
 .../templates/demo/table/pageGo.html          |   77 -
 .../templates/demo/table/params.html          |  158 --
 .../templates/demo/table/remember.html        |   89 -
 .../templates/demo/table/search.html          |  168 --
 53 files changed, 13481 deletions(-)
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoDialogController.java
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoIconController.java
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoReportController.java
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java
 delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/autocomplete.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/basic.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/button.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/datetime.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/duallistbox.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/grid.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/jasny.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/select.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/sortable.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/tabs_panels.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/upload.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/validate.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/form/wizard.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/icon/fontawesome.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/icon/glyphicons.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/modal/dialog.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/modal/form.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/modal/layer.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/modal/table.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/modal/table/check.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/modal/table/parent.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/modal/table/radio.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/operate/add.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/operate/detail.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/operate/edit.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/operate/other.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/operate/table.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/report/echarts.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/report/metrics.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/report/peity.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/report/sparkline.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/button.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/detail.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/event.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/export.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/footer.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/image.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/multi.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/other.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/pageGo.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/params.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/remember.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/demo/table/search.html

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoDialogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoDialogController.java
deleted file mode 100644
index 78d6da74b..000000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoDialogController.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.ruoyi.web.controller.demo.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * 模态窗口
- * 
- * @author ruoyi
- */
-@Controller
-@RequestMapping("/demo/modal")
-public class DemoDialogController
-{
-    private String prefix = "demo/modal";
-
-    /**
-     * 模态窗口
-     */
-    @GetMapping("/dialog")
-    public String dialog()
-    {
-        return prefix + "/dialog";
-    }
-
-    /**
-     * 弹层组件
-     */
-    @GetMapping("/layer")
-    public String layer()
-    {
-        return prefix + "/layer";
-    }
-
-    /**
-     * 表单
-     */
-    @GetMapping("/form")
-    public String form()
-    {
-        return prefix + "/form";
-    }
-
-    /**
-     * 表格
-     */
-    @GetMapping("/table")
-    public String table()
-    {
-        return prefix + "/table";
-    }
-
-    /**
-     * 表格check
-     */
-    @GetMapping("/check")
-    public String check()
-    {
-        return prefix + "/table/check";
-    }
-
-    /**
-     * 表格radio
-     */
-    @GetMapping("/radio")
-    public String radio()
-    {
-        return prefix + "/table/radio";
-    }
-
-    /**
-     * 表格回传父窗体
-     */
-    @GetMapping("/parent")
-    public String parent()
-    {
-        return prefix + "/table/parent";
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java
deleted file mode 100644
index 264b5e12d..000000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package com.ruoyi.web.controller.demo.controller;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.core.domain.AjaxResult;
-
-/**
- * 表单相关
- * 
- * @author ruoyi
- */
-@Controller
-@RequestMapping("/demo/form")
-public class DemoFormController
-{
-    private String prefix = "demo/form";
-
-    private final static List<UserFormModel> users = new ArrayList<UserFormModel>();
-    {
-        users.add(new UserFormModel(1, "1000001", "测试1", "15888888888"));
-        users.add(new UserFormModel(2, "1000002", "测试2", "15666666666"));
-        users.add(new UserFormModel(3, "1000003", "测试3", "15666666666"));
-        users.add(new UserFormModel(4, "1000004", "测试4", "15666666666"));
-        users.add(new UserFormModel(5, "1000005", "测试5", "15666666666"));
-    }
-
-    /**
-     * 按钮页
-     */
-    @GetMapping("/button")
-    public String button()
-    {
-        return prefix + "/button";
-    }
-
-    /**
-     * 下拉框
-     */
-    @GetMapping("/select")
-    public String select()
-    {
-        return prefix + "/select";
-    }
-
-    /**
-     * 表单校验
-     */
-    @GetMapping("/validate")
-    public String validate()
-    {
-        return prefix + "/validate";
-    }
-
-    /**
-     * 功能扩展（包含文件上传）
-     */
-    @GetMapping("/jasny")
-    public String jasny()
-    {
-        return prefix + "/jasny";
-    }
-
-    /**
-     * 拖动排序
-     */
-    @GetMapping("/sortable")
-    public String sortable()
-    {
-        return prefix + "/sortable";
-    }
-
-    /**
-     * 选项卡 & 面板
-     */
-    @GetMapping("/tabs_panels")
-    public String tabs_panels()
-    {
-        return prefix + "/tabs_panels";
-    }
-
-    /**
-     * 栅格
-     */
-    @GetMapping("/grid")
-    public String grid()
-    {
-        return prefix + "/grid";
-    }
-
-    /**
-     * 表单向导
-     */
-    @GetMapping("/wizard")
-    public String wizard()
-    {
-        return prefix + "/wizard";
-    }
-
-    /**
-     * 文件上传
-     */
-    @GetMapping("/upload")
-    public String upload()
-    {
-        return prefix + "/upload";
-    }
-
-    /**
-     * 日期和时间页
-     */
-    @GetMapping("/datetime")
-    public String datetime()
-    {
-        return prefix + "/datetime";
-    }
-
-    /**
-     * 左右互选组件
-     */
-    @GetMapping("/duallistbox")
-    public String duallistbox()
-    {
-        return prefix + "/duallistbox";
-    }
-
-    /**
-     * 基本表单
-     */
-    @GetMapping("/basic")
-    public String basic()
-    {
-        return prefix + "/basic";
-    }
-
-    /**
-     * 搜索自动补全
-     */
-    @GetMapping("/autocomplete")
-    public String autocomplete()
-    {
-        return prefix + "/autocomplete";
-    }
-
-    /**
-     * 获取用户数据
-     */
-    @GetMapping("/userModel")
-    @ResponseBody
-    public AjaxResult userModel()
-    {
-        AjaxResult ajax = new AjaxResult();
-
-        ajax.put("code", 200);
-        ajax.put("value", users);
-        return ajax;
-    }
-
-    /**
-     * 获取数据集合
-     */
-    @GetMapping("/collection")
-    @ResponseBody
-    public AjaxResult collection()
-    {
-        String[] array = { "ruoyi 1", "ruoyi 2", "ruoyi 3", "ruoyi 4", "ruoyi 5" };
-        AjaxResult ajax = new AjaxResult();
-        ajax.put("value", array);
-        return ajax;
-    }
-}
-
-class UserFormModel
-{
-    /** 用户ID */
-    private int userId;
-
-    /** 用户编号 */
-    private String userCode;
-
-    /** 用户姓名 */
-    private String userName;
-
-    /** 用户手机 */
-    private String userPhone;
-
-    public UserFormModel()
-    {
-
-    }
-
-    public UserFormModel(int userId, String userCode, String userName, String userPhone)
-    {
-        this.userId = userId;
-        this.userCode = userCode;
-        this.userName = userName;
-        this.userPhone = userPhone;
-    }
-
-    public int getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(int userId)
-    {
-        this.userId = userId;
-    }
-
-    public String getUserCode()
-    {
-        return userCode;
-    }
-
-    public void setUserCode(String userCode)
-    {
-        this.userCode = userCode;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getUserPhone()
-    {
-        return userPhone;
-    }
-
-    public void setUserPhone(String userPhone)
-    {
-        this.userPhone = userPhone;
-    }
-
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoIconController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoIconController.java
deleted file mode 100644
index 490c3e061..000000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoIconController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.ruoyi.web.controller.demo.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * 图标相关
- * 
- * @author ruoyi
- */
-@Controller
-@RequestMapping("/demo/icon")
-public class DemoIconController
-{
-    private String prefix = "demo/icon";
-
-    /**
-     * FontAwesome图标
-     */
-    @GetMapping("/fontawesome")
-    public String fontAwesome()
-    {
-        return prefix + "/fontawesome";
-    }
-
-    /**
-     * Glyphicons图标
-     */
-    @GetMapping("/glyphicons")
-    public String glyphicons()
-    {
-        return prefix + "/glyphicons";
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java
deleted file mode 100644
index 8c35b23eb..000000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package com.ruoyi.web.controller.demo.controller;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.PageDomain;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.page.TableSupport;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.exception.BusinessException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.web.controller.demo.domain.UserOperateModel;
-
-/**
- * 操作控制
- * 
- * @author ruoyi
- */
-@Controller
-@RequestMapping("/demo/operate")
-public class DemoOperateController extends BaseController
-{
-    private String prefix = "demo/operate";
-
-    private final static Map<Integer, UserOperateModel> users = new LinkedHashMap<Integer, UserOperateModel>();
-    {
-        users.put(1, new UserOperateModel(1, "1000001", "测试1", "0", "15888888888", "ry@qq.com", 150.0, "0"));
-        users.put(2, new UserOperateModel(2, "1000002", "测试2", "1", "15666666666", "ry@qq.com", 180.0, "1"));
-        users.put(3, new UserOperateModel(3, "1000003", "测试3", "0", "15666666666", "ry@qq.com", 110.0, "1"));
-        users.put(4, new UserOperateModel(4, "1000004", "测试4", "1", "15666666666", "ry@qq.com", 220.0, "1"));
-        users.put(5, new UserOperateModel(5, "1000005", "测试5", "0", "15666666666", "ry@qq.com", 140.0, "1"));
-        users.put(6, new UserOperateModel(6, "1000006", "测试6", "1", "15666666666", "ry@qq.com", 330.0, "1"));
-        users.put(7, new UserOperateModel(7, "1000007", "测试7", "0", "15666666666", "ry@qq.com", 160.0, "1"));
-        users.put(8, new UserOperateModel(8, "1000008", "测试8", "1", "15666666666", "ry@qq.com", 170.0, "1"));
-        users.put(9, new UserOperateModel(9, "1000009", "测试9", "0", "15666666666", "ry@qq.com", 180.0, "1"));
-        users.put(10, new UserOperateModel(10, "1000010", "测试10", "0", "15666666666", "ry@qq.com", 210.0, "1"));
-        users.put(11, new UserOperateModel(11, "1000011", "测试11", "1", "15666666666", "ry@qq.com", 110.0, "1"));
-        users.put(12, new UserOperateModel(12, "1000012", "测试12", "0", "15666666666", "ry@qq.com", 120.0, "1"));
-        users.put(13, new UserOperateModel(13, "1000013", "测试13", "1", "15666666666", "ry@qq.com", 380.0, "1"));
-        users.put(14, new UserOperateModel(14, "1000014", "测试14", "0", "15666666666", "ry@qq.com", 280.0, "1"));
-        users.put(15, new UserOperateModel(15, "1000015", "测试15", "0", "15666666666", "ry@qq.com", 570.0, "1"));
-        users.put(16, new UserOperateModel(16, "1000016", "测试16", "1", "15666666666", "ry@qq.com", 260.0, "1"));
-        users.put(17, new UserOperateModel(17, "1000017", "测试17", "1", "15666666666", "ry@qq.com", 210.0, "1"));
-        users.put(18, new UserOperateModel(18, "1000018", "测试18", "1", "15666666666", "ry@qq.com", 340.0, "1"));
-        users.put(19, new UserOperateModel(19, "1000019", "测试19", "1", "15666666666", "ry@qq.com", 160.0, "1"));
-        users.put(20, new UserOperateModel(20, "1000020", "测试20", "1", "15666666666", "ry@qq.com", 220.0, "1"));
-        users.put(21, new UserOperateModel(21, "1000021", "测试21", "1", "15666666666", "ry@qq.com", 120.0, "1"));
-        users.put(22, new UserOperateModel(22, "1000022", "测试22", "1", "15666666666", "ry@qq.com", 130.0, "1"));
-        users.put(23, new UserOperateModel(23, "1000023", "测试23", "1", "15666666666", "ry@qq.com", 490.0, "1"));
-        users.put(24, new UserOperateModel(24, "1000024", "测试24", "1", "15666666666", "ry@qq.com", 570.0, "1"));
-        users.put(25, new UserOperateModel(25, "1000025", "测试25", "1", "15666666666", "ry@qq.com", 250.0, "1"));
-        users.put(26, new UserOperateModel(26, "1000026", "测试26", "1", "15666666666", "ry@qq.com", 250.0, "1"));
-    }
-
-    /**
-     * 表格
-     */
-    @GetMapping("/table")
-    public String table()
-    {
-        return prefix + "/table";
-    }
-
-    /**
-     * 其他
-     */
-    @GetMapping("/other")
-    public String other()
-    {
-        return prefix + "/other";
-    }
-
-    /**
-     * 查询数据
-     */
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(UserOperateModel userModel)
-    {
-        TableDataInfo rspData = new TableDataInfo();
-        List<UserOperateModel> userList = new ArrayList<UserOperateModel>(users.values());
-        // 查询条件过滤
-        if (StringUtils.isNotEmpty(userModel.getSearchValue()))
-        {
-            userList.clear();
-            for (Map.Entry<Integer, UserOperateModel> entry : users.entrySet())
-            {
-                if (entry.getValue().getUserName().equals(userModel.getSearchValue()))
-                {
-                    userList.add(entry.getValue());
-                }
-            }
-        }
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize())
-        {
-            rspData.setRows(userList);
-            rspData.setTotal(userList.size());
-            return rspData;
-        }
-        Integer pageNum = (pageDomain.getPageNum() - 1) * 10;
-        Integer pageSize = pageDomain.getPageNum() * 10;
-        if (pageSize > userList.size())
-        {
-            pageSize = userList.size();
-        }
-        rspData.setRows(userList.subList(pageNum, pageSize));
-        rspData.setTotal(userList.size());
-        return rspData;
-    }
-
-    /**
-     * 新增用户
-     */
-    @GetMapping("/add")
-    public String add(ModelMap mmap)
-    {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存用户
-     */
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(UserOperateModel user)
-    {
-        Integer userId = users.size() + 1;
-        user.setUserId(userId);
-        return AjaxResult.success(users.put(userId, user));
-    }
-
-    /**
-     * 修改用户
-     */
-    @GetMapping("/edit/{userId}")
-    public String edit(@PathVariable("userId") Integer userId, ModelMap mmap)
-    {
-        mmap.put("user", users.get(userId));
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存用户
-     */
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(UserOperateModel user)
-    {
-        return AjaxResult.success(users.put(user.getUserId(), user));
-    }
-
-    /**
-     * 导出
-     */
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(UserOperateModel user)
-    {
-        List<UserOperateModel> list = new ArrayList<UserOperateModel>(users.values());
-        ExcelUtil<UserOperateModel> util = new ExcelUtil<UserOperateModel>(UserOperateModel.class);
-        return util.exportExcel(list, "用户数据");
-    }
-
-    /**
-     * 下载模板
-     */
-    @GetMapping("/importTemplate")
-    @ResponseBody
-    public AjaxResult importTemplate()
-    {
-        ExcelUtil<UserOperateModel> util = new ExcelUtil<UserOperateModel>(UserOperateModel.class);
-        return util.importTemplateExcel("用户数据");
-    }
-
-    /**
-     * 导入数据
-     */
-    @PostMapping("/importData")
-    @ResponseBody
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
-        ExcelUtil<UserOperateModel> util = new ExcelUtil<UserOperateModel>(UserOperateModel.class);
-        List<UserOperateModel> userList = util.importExcel(file.getInputStream());
-        String message = importUser(userList, updateSupport);
-        return AjaxResult.success(message);
-    }
-
-    /**
-     * 删除用户
-     */
-    @PostMapping("/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        Integer[] userIds = Convert.toIntArray(ids);
-        for (Integer userId : userIds)
-        {
-            users.remove(userId);
-        }
-        return AjaxResult.success();
-    }
-
-    /**
-     * 查看详细
-     */
-    @GetMapping("/detail/{userId}")
-    public String detail(@PathVariable("userId") Integer userId, ModelMap mmap)
-    {
-        mmap.put("user", users.get(userId));
-        return prefix + "/detail";
-    }
-
-    @PostMapping("/clean")
-    @ResponseBody
-    public AjaxResult clean()
-    {
-        users.clear();
-        return success();
-    }
-
-    /**
-     * 导入用户数据
-     * 
-     * @param userList 用户数据列表
-     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
-     * @return 结果
-     */
-    public String importUser(List<UserOperateModel> userList, Boolean isUpdateSupport)
-    {
-        if (StringUtils.isNull(userList) || userList.size() == 0)
-        {
-            throw new BusinessException("导入用户数据不能为空！");
-        }
-        int successNum = 0;
-        int failureNum = 0;
-        StringBuilder successMsg = new StringBuilder();
-        StringBuilder failureMsg = new StringBuilder();
-        for (UserOperateModel user : userList)
-        {
-            try
-            {
-                // 验证是否存在这个用户
-                boolean userFlag = false;
-                for (Map.Entry<Integer, UserOperateModel> entry : users.entrySet())
-                {
-                    if (entry.getValue().getUserName().equals(user.getUserName()))
-                    {
-                        userFlag = true;
-                        break;
-                    }
-                }
-                if (!userFlag)
-                {
-                    Integer userId = users.size() + 1;
-                    user.setUserId(userId);
-                    users.put(userId, user);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、用户 " + user.getUserName() + " 导入成功");
-                }
-                else if (isUpdateSupport)
-                {
-                    users.put(user.getUserId(), user);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、用户 " + user.getUserName() + " 更新成功");
-                }
-                else
-                {
-                    failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、用户 " + user.getUserName() + " 已存在");
-                }
-            }
-            catch (Exception e)
-            {
-                failureNum++;
-                String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
-                failureMsg.append(msg + e.getMessage());
-            }
-        }
-        if (failureNum > 0)
-        {
-            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
-            throw new BusinessException(failureMsg.toString());
-        }
-        else
-        {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
-        }
-        return successMsg.toString();
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoReportController.java
deleted file mode 100644
index 318e8f08b..000000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoReportController.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.ruoyi.web.controller.demo.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * 报表
- * 
- * @author ruoyi
- */
-@Controller
-@RequestMapping("/demo/report")
-public class DemoReportController
-{
-    private String prefix = "demo/report";
-
-    /**
-     * 百度ECharts
-     */
-    @GetMapping("/echarts")
-    public String echarts()
-    {
-        return prefix + "/echarts";
-    }
-
-    /**
-     * 图表插件
-     */
-    @GetMapping("/peity")
-    public String peity()
-    {
-        return prefix + "/peity";
-    }
-
-    /**
-     * 线状图插件
-     */
-    @GetMapping("/sparkline")
-    public String sparkline()
-    {
-        return prefix + "/sparkline";
-    }
-
-    /**
-     * 图表组合
-     */
-    @GetMapping("/metrics")
-    public String metrics()
-    {
-        return prefix + "/metrics";
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java
deleted file mode 100644
index 02e735e18..000000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java
+++ /dev/null
@@ -1,367 +0,0 @@
-package com.ruoyi.web.controller.demo.controller;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.page.PageDomain;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.page.TableSupport;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 表格相关
- * 
- * @author ruoyi
- */
-@Controller
-@RequestMapping("/demo/table")
-public class DemoTableController extends BaseController
-{
-    private String prefix = "demo/table";
-
-    private final static List<UserTableModel> users = new ArrayList<UserTableModel>();
-    {
-        users.add(new UserTableModel(1, "1000001", "测试1", "0", "15888888888", "ry@qq.com", 150.0, "0"));
-        users.add(new UserTableModel(2, "1000002", "测试2", "1", "15666666666", "ry@qq.com", 180.0, "1"));
-        users.add(new UserTableModel(3, "1000003", "测试3", "0", "15666666666", "ry@qq.com", 110.0, "1"));
-        users.add(new UserTableModel(4, "1000004", "测试4", "1", "15666666666", "ry@qq.com", 220.0, "1"));
-        users.add(new UserTableModel(5, "1000005", "测试5", "0", "15666666666", "ry@qq.com", 140.0, "1"));
-        users.add(new UserTableModel(6, "1000006", "测试6", "1", "15666666666", "ry@qq.com", 330.0, "1"));
-        users.add(new UserTableModel(7, "1000007", "测试7", "0", "15666666666", "ry@qq.com", 160.0, "1"));
-        users.add(new UserTableModel(8, "1000008", "测试8", "1", "15666666666", "ry@qq.com", 170.0, "1"));
-        users.add(new UserTableModel(9, "1000009", "测试9", "0", "15666666666", "ry@qq.com", 180.0, "1"));
-        users.add(new UserTableModel(10, "1000010", "测试10", "0", "15666666666", "ry@qq.com", 210.0, "1"));
-        users.add(new UserTableModel(11, "1000011", "测试11", "1", "15666666666", "ry@qq.com", 110.0, "1"));
-        users.add(new UserTableModel(12, "1000012", "测试12", "0", "15666666666", "ry@qq.com", 120.0, "1"));
-        users.add(new UserTableModel(13, "1000013", "测试13", "1", "15666666666", "ry@qq.com", 380.0, "1"));
-        users.add(new UserTableModel(14, "1000014", "测试14", "0", "15666666666", "ry@qq.com", 280.0, "1"));
-        users.add(new UserTableModel(15, "1000015", "测试15", "0", "15666666666", "ry@qq.com", 570.0, "1"));
-        users.add(new UserTableModel(16, "1000016", "测试16", "1", "15666666666", "ry@qq.com", 260.0, "1"));
-        users.add(new UserTableModel(17, "1000017", "测试17", "1", "15666666666", "ry@qq.com", 210.0, "1"));
-        users.add(new UserTableModel(18, "1000018", "测试18", "1", "15666666666", "ry@qq.com", 340.0, "1"));
-        users.add(new UserTableModel(19, "1000019", "测试19", "1", "15666666666", "ry@qq.com", 160.0, "1"));
-        users.add(new UserTableModel(20, "1000020", "测试20", "1", "15666666666", "ry@qq.com", 220.0, "1"));
-        users.add(new UserTableModel(21, "1000021", "测试21", "1", "15666666666", "ry@qq.com", 120.0, "1"));
-        users.add(new UserTableModel(22, "1000022", "测试22", "1", "15666666666", "ry@qq.com", 130.0, "1"));
-        users.add(new UserTableModel(23, "1000023", "测试23", "1", "15666666666", "ry@qq.com", 490.0, "1"));
-        users.add(new UserTableModel(24, "1000024", "测试24", "1", "15666666666", "ry@qq.com", 570.0, "1"));
-        users.add(new UserTableModel(25, "1000025", "测试25", "1", "15666666666", "ry@qq.com", 250.0, "1"));
-        users.add(new UserTableModel(26, "1000026", "测试26", "1", "15666666666", "ry@qq.com", 250.0, "1"));
-    }
-
-    /**
-     * 搜索相关
-     */
-    @GetMapping("/search")
-    public String search()
-    {
-        return prefix + "/search";
-    }
-
-    /**
-     * 数据汇总
-     */
-    @GetMapping("/footer")
-    public String footer()
-    {
-        return prefix + "/footer";
-    }
-
-    /**
-     * 组合表头
-     */
-    @GetMapping("/groupHeader")
-    public String groupHeader()
-    {
-        return prefix + "/groupHeader";
-    }
-
-    /**
-     * 表格导出
-     */
-    @GetMapping("/export")
-    public String export()
-    {
-        return prefix + "/export";
-    }
-
-    /**
-     * 翻页记住选择
-     */
-    @GetMapping("/remember")
-    public String remember()
-    {
-        return prefix + "/remember";
-    }
-
-    /**
-     * 跳转至指定页
-     */
-    @GetMapping("/pageGo")
-    public String pageGo()
-    {
-        return prefix + "/pageGo";
-    }
-
-    /**
-     * 自定义查询参数
-     */
-    @GetMapping("/params")
-    public String params()
-    {
-        return prefix + "/params";
-    }
-
-    /**
-     * 多表格
-     */
-    @GetMapping("/multi")
-    public String multi()
-    {
-        return prefix + "/multi";
-    }
-
-    /**
-     * 点击按钮加载表格
-     */
-    @GetMapping("/button")
-    public String button()
-    {
-        return prefix + "/button";
-    }
-
-    /**
-     * 表格冻结列
-     */
-    @GetMapping("/fixedColumns")
-    public String fixedColumns()
-    {
-        return prefix + "/fixedColumns";
-    }
-
-    /**
-     * 自定义触发事件
-     */
-    @GetMapping("/event")
-    public String event()
-    {
-        return prefix + "/event";
-    }
-
-    /**
-     * 表格细节视图
-     */
-    @GetMapping("/detail")
-    public String detail()
-    {
-        return prefix + "/detail";
-    }
-
-    /**
-     * 表格图片预览
-     */
-    @GetMapping("/image")
-    public String image()
-    {
-        return prefix + "/image";
-    }
-
-    /**
-     * 表格其他操作
-     */
-    @GetMapping("/other")
-    public String other()
-    {
-        return prefix + "/other";
-    }
-
-    /**
-     * 查询数据
-     */
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(UserTableModel userModel)
-    {
-        TableDataInfo rspData = new TableDataInfo();
-        List<UserTableModel> userList = new ArrayList<UserTableModel>(Arrays.asList(new UserTableModel[users.size()]));
-        Collections.copy(userList, users);
-        // 查询条件过滤
-        if (StringUtils.isNotEmpty(userModel.getUserName()))
-        {
-            userList.clear();
-            for (UserTableModel user : users)
-            {
-                if (user.getUserName().equals(userModel.getUserName()))
-                {
-                    userList.add(user);
-                }
-            }
-        }
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize())
-        {
-            rspData.setRows(userList);
-            rspData.setTotal(userList.size());
-            return rspData;
-        }
-        Integer pageNum = (pageDomain.getPageNum() - 1) * 10;
-        Integer pageSize = pageDomain.getPageNum() * 10;
-        if (pageSize > userList.size())
-        {
-            pageSize = userList.size();
-        }
-        rspData.setRows(userList.subList(pageNum, pageSize));
-        rspData.setTotal(userList.size());
-        return rspData;
-    }
-}
-
-class UserTableModel
-{
-    /** 用户ID */
-    private int userId;
-
-    /** 用户编号 */
-    private String userCode;
-
-    /** 用户姓名 */
-    private String userName;
-
-    /** 用户性别 */
-    private String userSex;
-
-    /** 用户手机 */
-    private String userPhone;
-
-    /** 用户邮箱 */
-    private String userEmail;
-
-    /** 用户余额 */
-    private double userBalance;
-
-    /** 用户状态（0正常 1停用） */
-    private String status;
-
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    public UserTableModel()
-    {
-
-    }
-
-    public UserTableModel(int userId, String userCode, String userName, String userSex, String userPhone,
-            String userEmail, double userBalance, String status)
-    {
-        this.userId = userId;
-        this.userCode = userCode;
-        this.userName = userName;
-        this.userSex = userSex;
-        this.userPhone = userPhone;
-        this.userEmail = userEmail;
-        this.userBalance = userBalance;
-        this.status = status;
-        this.createTime = DateUtils.getNowDate();
-    }
-
-    public int getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(int userId)
-    {
-        this.userId = userId;
-    }
-
-    public String getUserCode()
-    {
-        return userCode;
-    }
-
-    public void setUserCode(String userCode)
-    {
-        this.userCode = userCode;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getUserSex()
-    {
-        return userSex;
-    }
-
-    public void setUserSex(String userSex)
-    {
-        this.userSex = userSex;
-    }
-
-    public String getUserPhone()
-    {
-        return userPhone;
-    }
-
-    public void setUserPhone(String userPhone)
-    {
-        this.userPhone = userPhone;
-    }
-
-    public String getUserEmail()
-    {
-        return userEmail;
-    }
-
-    public void setUserEmail(String userEmail)
-    {
-        this.userEmail = userEmail;
-    }
-
-    public double getUserBalance()
-    {
-        return userBalance;
-    }
-
-    public void setUserBalance(double userBalance)
-    {
-        this.userBalance = userBalance;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public Date getCreateTime()
-    {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime)
-    {
-        this.createTime = createTime;
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java
deleted file mode 100644
index ac95abf2f..000000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.ruoyi.web.controller.demo.domain;
-
-import java.util.Date;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.Type;
-import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.utils.DateUtils;
-
-public class UserOperateModel extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    private int userId;
-
-    @Excel(name = "用户编号")
-    private String userCode;
-
-    @Excel(name = "用户姓名")
-    private String userName;
-
-    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
-    private String userSex;
-
-    @Excel(name = "用户手机")
-    private String userPhone;
-
-    @Excel(name = "用户邮箱")
-    private String userEmail;
-
-    @Excel(name = "用户余额")
-    private double userBalance;
-
-    @Excel(name = "用户状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
-    private Date createTime;
-
-    public UserOperateModel()
-    {
-
-    }
-
-    public UserOperateModel(int userId, String userCode, String userName, String userSex, String userPhone,
-            String userEmail, double userBalance, String status)
-    {
-        this.userId = userId;
-        this.userCode = userCode;
-        this.userName = userName;
-        this.userSex = userSex;
-        this.userPhone = userPhone;
-        this.userEmail = userEmail;
-        this.userBalance = userBalance;
-        this.status = status;
-        this.createTime = DateUtils.getNowDate();
-    }
-
-    public int getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(int userId)
-    {
-        this.userId = userId;
-    }
-
-    public String getUserCode()
-    {
-        return userCode;
-    }
-
-    public void setUserCode(String userCode)
-    {
-        this.userCode = userCode;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getUserSex()
-    {
-        return userSex;
-    }
-
-    public void setUserSex(String userSex)
-    {
-        this.userSex = userSex;
-    }
-
-    public String getUserPhone()
-    {
-        return userPhone;
-    }
-
-    public void setUserPhone(String userPhone)
-    {
-        this.userPhone = userPhone;
-    }
-
-    public String getUserEmail()
-    {
-        return userEmail;
-    }
-
-    public void setUserEmail(String userEmail)
-    {
-        this.userEmail = userEmail;
-    }
-
-    public double getUserBalance()
-    {
-        return userBalance;
-    }
-
-    public void setUserBalance(double userBalance)
-    {
-        this.userBalance = userBalance;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public Date getCreateTime()
-    {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime)
-    {
-        this.createTime = createTime;
-    }
-}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
deleted file mode 100644
index bddbe7789..000000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.ruoyi.web.controller.tool;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * swagger 用户测试方法
- * 
- * @author ruoyi
- */
-@Api("用户信息管理")
-@RestController
-@RequestMapping("/test/user")
-public class TestController extends BaseController
-{
-    private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
-    {
-        users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
-        users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
-    }
-
-    @ApiOperation("获取用户列表")
-    @GetMapping("/list")
-    public AjaxResult userList()
-    {
-        List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
-        return AjaxResult.success(userList);
-    }
-
-    @ApiOperation("获取用户详细")
-    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
-    @GetMapping("/{userId}")
-    public AjaxResult getUser(@PathVariable Integer userId)
-    {
-        if (!users.isEmpty() && users.containsKey(userId))
-        {
-            return AjaxResult.success(users.get(userId));
-        }
-        else
-        {
-            return error("用户不存在");
-        }
-    }
-
-    @ApiOperation("新增用户")
-    @ApiImplicitParam(name = "userEntity", value = "新增用户信息", dataType = "UserEntity")
-    @PostMapping("/save")
-    public AjaxResult save(UserEntity user)
-    {
-        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
-        {
-            return error("用户ID不能为空");
-        }
-        return AjaxResult.success(users.put(user.getUserId(), user));
-    }
-
-    @ApiOperation("更新用户")
-    @ApiImplicitParam(name = "userEntity", value = "新增用户信息", dataType = "UserEntity")
-    @PutMapping("/update")
-    public AjaxResult update(UserEntity user)
-    {
-        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
-        {
-            return error("用户ID不能为空");
-        }
-        if (users.isEmpty() || !users.containsKey(user.getUserId()))
-        {
-            return error("用户不存在");
-        }
-        users.remove(user.getUserId());
-        return AjaxResult.success(users.put(user.getUserId(), user));
-    }
-
-    @ApiOperation("删除用户信息")
-    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
-    @DeleteMapping("/{userId}")
-    public AjaxResult delete(@PathVariable Integer userId)
-    {
-        if (!users.isEmpty() && users.containsKey(userId))
-        {
-            users.remove(userId);
-            return success();
-        }
-        else
-        {
-            return error("用户不存在");
-        }
-    }
-}
-
-@ApiModel("用户实体")
-class UserEntity
-{
-    @ApiModelProperty("用户ID")
-    private Integer userId;
-
-    @ApiModelProperty("用户名称")
-    private String username;
-
-    @ApiModelProperty("用户密码")
-    private String password;
-
-    @ApiModelProperty("用户手机")
-    private String mobile;
-
-    public UserEntity()
-    {
-
-    }
-
-    public UserEntity(Integer userId, String username, String password, String mobile)
-    {
-        this.userId = userId;
-        this.username = username;
-        this.password = password;
-        this.mobile = mobile;
-    }
-
-    public Integer getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(Integer userId)
-    {
-        this.userId = userId;
-    }
-
-    public String getUsername()
-    {
-        return username;
-    }
-
-    public void setUsername(String username)
-    {
-        this.username = username;
-    }
-
-    public String getPassword()
-    {
-        return password;
-    }
-
-    public void setPassword(String password)
-    {
-        this.password = password;
-    }
-
-    public String getMobile()
-    {
-        return mobile;
-    }
-
-    public void setMobile(String mobile)
-    {
-        this.mobile = mobile;
-    }
-}
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/autocomplete.html b/ruoyi-admin/src/main/resources/templates/demo/form/autocomplete.html
deleted file mode 100644
index 5db41bfc4..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/autocomplete.html
+++ /dev/null
@@ -1,322 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('搜索自动补全')" />
-</head>
-<body class="gray-bg">
-      <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>搜索自动补全<small>https://github.com/lzwme/bootstrap-suggest-plugin</small></h5>
-                    </div>  
-                    <div class="ibox-content">
-                        <p>展示下拉菜单按钮。</p>
-                        <div class="row">
-                            <div class="col-lg-6">
-                                <div class="input-group">
-                                    <input type="text" class="form-control" id="suggest-demo-1">
-                                    <div class="input-group-btn">
-                                        <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
-                                            <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <p>不展示下拉菜单按钮。</p>
-                        <div class="row">
-                            <div class="col-lg-6">
-                                <div class="input-group">
-                                    <input type="text" class="form-control" id="suggest-demo-2">
-                                    <div class="input-group-btn">
-                                        <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
-                                            <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <p>前端json中获取数据</p>
-                        <div class="row">
-                            <div class="col-lg-6">
-                                <div class="input-group">
-                                    <input type="text" class="form-control" id="suggest-demo-3">
-                                    <div class="input-group-btn">
-                                        <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
-                                            <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                                        </ul>
-                                    </div>
-                                    <!-- /btn-group -->
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <h3>百度搜索</h3>
-                        <p>支持逗号分隔多关键字</p>
-                        <div class="row">
-                            <div class="col-lg-6">
-                                <div class="input-group" style="width: 300px;">
-                                    <input type="text" class="form-control" id="baidu">
-                                    <div class="input-group-btn">
-                                        <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
-                                            <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                                        </ul>
-                                    </div>
-                                    <!-- /btn-group -->
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <h3>淘宝搜索</h3>
-                        <p>支持逗号分隔多关键字</p>
-                        <div class="row">
-                            <div class="col-lg-6">
-                                <div class="input-group" style="width: 400px;">
-                                    <input type="text" class="form-control" id="taobao">
-                                    <div class="input-group-btn">
-                                        <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
-                                            <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                                        </ul>
-                                    </div>
-                                    <!-- /btn-group -->
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="form-group">
-                            <label class="font-noraml">相关参数详细信息</label>
-                            <div><a href="http://doc.ruoyi.vip/#/standard/zjwd?id=bootstrap-suggest" target="_blank">http://doc.ruoyi.vip/#/standard/zjwd?id=bootstrap-suggest</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>搜索自动补全<small>https://github.com/bassjobsen/Bootstrap-3-Typeahead</small></h5>
-                    </div>  
-                    <div class="ibox-content">
-                        <p>通过数据属性的基本示例。</p>
-                        <div class="row">
-                            <div class="col-lg-6">
-                           	    <input type="text" placeholder="ruoyi..." data-provide="typeahead" data-source='["ruoyi 1","ruoyi 2","ruoyi 3"]' class="form-control" />
-                            </div>
-                        </div>
-                        <hr>
-                        
-                        <p>通过javascript的基本示例。</p>
-                        <div class="row">
-                            <div class="col-lg-6">
-                                <input type="text" placeholder="ruoyi..." class="form-control" id="typeahead-demo-1"/>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <p>通过javascript的复杂示例。</p>
-                        <div class="row">
-                            <div class="col-lg-6">
-                                <input type="text" placeholder="ruoyi..." class="form-control" id="typeahead-demo-2"/>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <p>后台url中获取简单数据</p>
-                        <div class="row">
-                            <div class="col-lg-6">
-                                <input type="text" placeholder="ruoyi..." class="form-control" id="typeahead-demo-3"/>
-                            </div>
-                        </div>
-                        
-                        <hr>
-                        <div class="form-group">
-                            <label class="font-noraml">相关参数详细信息</label>
-                            <div><a href="http://doc.ruoyi.vip/#/standard/zjwd?id=bootstrap-typeahead" target="_blank">http://doc.ruoyi.vip/#/standard/zjwd?id=bootstrap-typeahead</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: bootstrap-suggest-js" />
-    <th:block th:include="include :: bootstrap-typeahead-js" />
-    <script type="text/javascript">
-        
-	    var testBsSuggest = $("#suggest-demo-1").bsSuggest({
-	        url: ctx + "demo/form/userModel",
-	        idField: "userId",
-	        keyField: "userName"
-	    }).on('onDataRequestSuccess', function (e, result) {
-	        console.log('onDataRequestSuccess: ', result);
-	    }).on('onSetSelectValue', function (e, keyword) {
-	        console.log('onSetSelectValue: ', keyword);
-	    }).on('onUnsetSelectValue', function (e) {
-	        console.log("onUnsetSelectValue");
-	    });
-	    
-	    var testBsSuggest = $("#suggest-demo-2").bsSuggest({
-	        url: ctx + "demo/form/userModel",
-	        showBtn: false,
-	        idField: "userId",
-	        keyField: "userName"
-	    }).on('onDataRequestSuccess', function (e, result) {
-	        console.log('onDataRequestSuccess: ', result);
-	    }).on('onSetSelectValue', function (e, keyword) {
-	        console.log('onSetSelectValue: ', keyword);
-	    }).on('onUnsetSelectValue', function (e) {
-	        console.log("onUnsetSelectValue");
-	    });
-	
-	    //data 数据中获取
-	    var testdataBsSuggest = $("#suggest-demo-3").bsSuggest({
-	        indexId: 1,
-	        indexKey: 2,
-	        data: {
-	            'value': [
-	                {
-	                    'userId': '1',
-	                    'userCode': '1000001',
-	                    'userName': '测试1',
-	                    'userPhone': '15888888888'
-	                },
-	                {
-	                    'userId': '2',
-	                    'userCode': '1000002',
-	                    'userName': '测试2',
-	                    'userPhone': '15888888888'
-	                },
-	                {
-	                    'userId': '3',
-	                    'userCode': '1000003',
-	                    'userName': '测试3',
-	                    'userPhone': '15888888888'
-	                },
-	                {
-	                    'userId': '4',
-	                    'userCode': '1000004',
-	                    'userName': '测试4',
-	                    'userPhone': '15888888888'
-	                },
-	                {
-	                    'userId': '5',
-	                    'userCode': '1000005',
-	                    'userName': '测试5',
-	                    'userPhone': '15888888888'
-	                }
-				],
-	            'defaults': 'http://ruoyi.vip'
-	        }
-	    });
-	    
-	    //百度搜索测试
-	    var baiduBsSuggest = $("#baidu").bsSuggest({
-	        allowNoKeyword: false, //是否允许无关键字时请求数据
-	        multiWord: true, //以分隔符号分割的多关键字支持
-	        separator: ",", //多关键字支持时的分隔符，默认为空格
-	        getDataMethod: "url", //获取数据的方式，总是从 URL 获取
-	        url: 'http://unionsug.baidu.com/su?p=3&t=' + (new Date()).getTime() + '&wd=',
-	        /*优先从url ajax 请求 json 帮助数据，注意最后一个参数为关键字请求参数*/
-	        jsonp: 'cb',
-	        /*如果从 url 获取数据，并且需要跨域，则该参数必须设置*/
-	        processData: function (json) { // url 获取数据时，对数据的处理，作为 getData 的回调函数
-	            var i, len, data = {
-	                value: []
-	            };
-	            if (!json || !json.s || json.s.length === 0) {
-	                return false;
-	            }
-	
-	            console.log(json);
-	            len = json.s.length;
-	
-	            jsonStr = "{'value':[";
-	            for (i = 0; i < len; i++) {
-	                data.value.push({
-	                    word: json.s[i]
-	                });
-	            }
-	            data.defaults = 'baidu';
-	
-	            //字符串转化为 js 对象
-	            return data;
-	        }
-	    });
-	    
-	    //淘宝搜索建议测试
-	    var taobaoBsSuggest = $("#taobao").bsSuggest({
-	        indexId: 2, //data.value 的第几个数据，作为input输入框的内容
-	        indexKey: 1, //data.value 的第几个数据，作为input输入框的内容
-	        allowNoKeyword: false, //是否允许无关键字时请求数据
-	        multiWord: true, //以分隔符号分割的多关键字支持
-	        separator: ",", //多关键字支持时的分隔符，默认为空格
-	        getDataMethod: "url", //获取数据的方式，总是从 URL 获取
-	        effectiveFieldsAlias: {
-	            Id: "序号",
-	            Keyword: "关键字",
-	            Count: "数量"
-	        },
-	        showHeader: true,
-	        url: 'http://suggest.taobao.com/sug?code=utf-8&extras=1&q=',
-	        /*优先从url ajax 请求 json 帮助数据，注意最后一个参数为关键字请求参数*/
-	        jsonp: 'callback',
-	        /*如果从 url 获取数据，并且需要跨域，则该参数必须设置*/
-	        processData: function (json) { // url 获取数据时，对数据的处理，作为 getData 的回调函数
-	            var i, len, data = {
-	                value: []
-	            };
-	
-	            if (!json || !json.result || json.result.length == 0) {
-	                return false;
-	            }
-	
-	            console.log(json);
-	            len = json.result.length;
-	
-	            for (i = 0; i < len; i++) {
-	                data.value.push({
-	                    "Id": (i + 1),
-	                    "Keyword": json.result[i][0],
-	                    "Count": json.result[i][1]
-	                });
-	            }
-	            console.log(data);
-	            return data;
-	        }
-	    });
-	    
-	    $('#typeahead-demo-1').typeahead({
-            source: ["ruoyi 1","ruoyi 2","ruoyi 3"]
-        });
-	    
-	    $('#typeahead-demo-2').typeahead({
-            source: [
-                {"name": "Afghanistan", "code": "AF", "ccn0": "040"},
-                {"name": "Land Islands", "code": "AX", "ccn0": "050"},
-                {"name": "Albania", "code": "AL","ccn0": "060"},
-                {"name": "Algeria", "code": "DZ","ccn0": "070"}
-            ]
-        });
-	    
-	    $.get(ctx + "demo/form/collection", function(data){
-	    	$("#typeahead-demo-3").typeahead({
-		        source: data.value
-		    });
-        },'json');
-    </script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/basic.html b/ruoyi-admin/src/main/resources/templates/demo/form/basic.html
deleted file mode 100644
index bf1bc76d2..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/basic.html
+++ /dev/null
@@ -1,593 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('基本表单')" />
-</head>
-<body class="gray-bg">
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-7">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>基本表单 <small>简单登录表单示例</small></h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="form_basic.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="form_basic.html#">选项1</a>
-                                </li>
-                                <li><a href="form_basic.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="row">
-                            <div class="col-sm-6 b-r">
-                                <h3 class="m-t-none m-b">登录</h3>
-                                <p>欢迎登录本站(⊙o⊙)</p>
-                                <form role="form">
-                                    <div class="form-group">
-                                        <label>用户名</label>
-                                        <input type="email" placeholder="请输入您注册的E-mail" class="form-control">
-                                    </div>
-                                    <div class="form-group">
-                                        <label>密码</label>
-                                        <input type="password" placeholder="请输入密码" class="form-control">
-                                    </div>
-                                    <div>
-                                        <button class="btn btn-sm btn-primary pull-right m-t-n-xs" type="submit"><strong>登 录</strong>
-                                        </button>
-                                        <label>
-                                            <input type="checkbox">自动登录</label>
-                                    </div>
-                                </form>
-                            </div>
-                            <div class="col-sm-6">
-                                <h4>还不是会员？</h4>
-                                <p>您可以注册一个新账户</p>
-                                <p class="text-center">
-                                    <a href="form_basic.html"><i class="fa fa-sign-in big-icon"></i></a>
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-5">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>横向表单</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="form_basic.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="form_basic.html#">选项1</a>
-                                </li>
-                                <li><a href="form_basic.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <form class="form-horizontal">
-                            <p>欢迎登录本站(⊙o⊙)</p>
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">用户名：</label>
-
-                                <div class="col-sm-8">
-                                    <input type="email" placeholder="用户名" class="form-control"> <span class="help-block m-b-none">请输入您注册时所填的E-mail</span>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">密码：</label>
-
-                                <div class="col-sm-8">
-                                    <input type="password" placeholder="密码" class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <div class="col-sm-offset-3 col-sm-8">
-                                    <button class="btn btn-sm btn-white" type="submit">登 录</button>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-8">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>内联表单</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="form_basic.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="form_basic.html#">选项1</a>
-                                </li>
-                                <li><a href="form_basic.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <form role="form" class="form-inline">
-                            <div class="form-group">
-                                <label for="exampleInputEmail2" class="sr-only">用户名</label>
-                                <input type="email" placeholder="请输入用户名" id="exampleInputEmail2" class="form-control">
-                            </div>
-                            <div class="form-group">
-                                <label for="exampleInputPassword2" class="sr-only">密码</label>
-                                <input type="password" placeholder="请输入密码" id="exampleInputPassword2" class="form-control">
-                            </div>
-                            <div class="checkbox m-l m-r-xs">
-                                <label>
-                                    <input type="checkbox"><i></i> 自动登录</label>
-                            </div>
-                            <button class="btn btn-white" type="submit">登录</button>
-                        </form>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-4">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>弹出表单 <small>弹出框登录示例</small></h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="form_basic.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="form_basic.html#">选项1</a>
-                                </li>
-                                <li><a href="form_basic.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="text-center">
-                            <a data-toggle="modal" class="btn btn-primary" href="form_basic.html#modal-form">打开登录窗口</a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>所有表单元素 <small>包括自定义样式的复选和单选按钮</small></h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="form_basic.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="form_basic.html#">选项1</a>
-                                </li>
-                                <li><a href="form_basic.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <form method="get" class="form-horizontal">
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">普通</label>
-
-                                <div class="col-sm-10">
-                                    <input type="text" class="form-control">
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">带说明信息</label>
-                                <div class="col-sm-10">
-                                    <input type="text" class="form-control"> <span class="help-block m-b-none">帮助文本，可能会超过一行，以块级元素显示</span>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">密码</label>
-
-                                <div class="col-sm-10">
-                                    <input type="password" class="form-control" name="password">
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">提示</label>
-
-                                <div class="col-sm-10">
-                                    <input type="text" placeholder="提示信息" class="form-control">
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">禁用</label>
-
-                                <div class="col-sm-10">
-                                    <input type="text" disabled="" placeholder="已被禁用" class="form-control">
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">静态控制</label>
-
-                                <div class="col-sm-10">
-                                    <p class="form-control-static">ruoyi.vip</p>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">复选框&amp;单选框
-                                    <br/>
-                                    <small class="text-navy">普通Bootstrap元素</small>
-                                </label>
-
-                                <div class="col-sm-10">
-                                    <div class="checkbox">
-                                        <label>
-                                            <input type="checkbox" value="">选项1</label>
-                                    </div>
-                                    <div class="radio">
-                                        <label>
-                                            <input type="radio" checked="" value="option1" id="optionsRadios1" name="optionsRadios">选项1</label>
-                                    </div>
-                                    <div class="radio">
-                                        <label>
-                                            <input type="radio" value="option2" id="optionsRadios2" name="optionsRadios">选项2</label>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">内联复选框</label>
-
-                                <div class="col-sm-10">
-                                    <label class="checkbox-inline">
-                                        <input type="checkbox" value="option1" id="inlineCheckbox1">a</label>
-                                    <label class="checkbox-inline">
-                                        <input type="checkbox" value="option2" id="inlineCheckbox2">b</label>
-                                    <label class="checkbox-inline">
-                                        <input type="checkbox" value="option3" id="inlineCheckbox3">c</label>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">复选框&amp;单选框
-                                    <br/><small class="text-navy">自定义样式</small>
-                                </label>
-
-                                <div class="col-sm-10">
-                                    <div class="checkbox check-box">
-                                        <label>
-                                            <input type="checkbox" value=""> <i></i> 选项1</label>
-                                    </div>
-                                    <div class="checkbox check-box">
-                                        <label>
-                                            <input type="checkbox" value="" checked=""> <i></i> 选项2（选中）</label>
-                                    </div>
-                                    <div class="checkbox check-box">
-                                        <label>
-                                            <input type="checkbox" value="" disabled="" checked=""> <i></i> 选项3（选中并禁用）</label>
-                                    </div>
-                                    <div class="checkbox check-box">
-                                        <label>
-                                            <input type="checkbox" value="" disabled=""> <i></i> 选项4（禁用）</label>
-                                    </div>
-                                    <div class="radio check-box">
-                                        <label>
-                                            <input type="radio" value="option1" name="a"> <i></i> 选项1</label>
-                                    </div>
-                                    <div class="radio check-box">
-                                        <label>
-                                            <input type="radio" checked="" value="option2" name="a"> <i></i> 选项2（选中）</label>
-                                    </div>
-                                    <div class="radio check-box">
-                                        <label>
-                                            <input type="radio" disabled="" checked="" value="option2"> <i></i> 选项3（选中并禁用）</label>
-                                    </div>
-                                    <div class="radio check-box">
-                                        <label>
-                                            <input type="radio" disabled="" name="a"> <i></i> 选项4（禁用）</label>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">内联复选框</label>
-
-                                <div class="col-sm-10">
-                                    <label class="checkbox-inline check-box">
-                                        <input type="checkbox" value="option1">a</label>
-                                    <label class="checkbox-inline check-box">
-                                        <input type="checkbox" value="option2">b</label>
-                                    <label class="checkbox-inline check-box">
-                                        <input type="checkbox" value="option3">c</label>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">Select</label>
-
-                                <div class="col-sm-10">
-                                    <select class="form-control m-b" name="account">
-                                        <option>选项 1</option>
-                                        <option>选项 2</option>
-                                        <option>选项 3</option>
-                                        <option>选项 4</option>
-                                    </select>
-
-                                    <div class="col-sm-4 m-l-n">
-                                        <select class="form-control" multiple="">
-                                            <option>选项 1</option>
-                                            <option>选项 2</option>
-                                            <option>选项 3</option>
-                                            <option>选项 4</option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group has-success">
-                                <label class="col-sm-2 control-label">验证通过</label>
-
-                                <div class="col-sm-10">
-                                    <input type="text" class="form-control">
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group has-warning">
-                                <label class="col-sm-2 control-label">未填写</label>
-
-                                <div class="col-sm-10">
-                                    <input type="text" class="form-control">
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group has-error">
-                                <label class="col-sm-2 control-label">验证未通过</label>
-
-                                <div class="col-sm-10">
-                                    <input type="text" class="form-control">
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">自定义尺寸</label>
-
-                                <div class="col-sm-10">
-                                    <input type="text" placeholder=".input-lg" class="form-control input-lg m-b">
-                                    <input type="text" placeholder="Default input" class="form-control m-b">
-                                    <input type="text" placeholder=".input-sm" class="form-control input-sm">
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">列尺寸</label>
-
-                                <div class="col-sm-10">
-                                    <div class="row">
-                                        <div class="col-md-2">
-                                            <input type="text" placeholder=".col-md-2" class="form-control">
-                                        </div>
-                                        <div class="col-md-3">
-                                            <input type="text" placeholder=".col-md-3" class="form-control">
-                                        </div>
-                                        <div class="col-md-4">
-                                            <input type="text" placeholder=".col-md-4" class="form-control">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">文本框组</label>
-
-                                <div class="col-sm-10">
-                                    <div class="input-group m-b"><span class="input-group-addon">@</span>
-                                        <input type="text" placeholder="用户名" class="form-control">
-                                    </div>
-                                    <div class="input-group m-b">
-                                        <input type="text" class="form-control"> <span class="input-group-addon">.00</span>
-                                    </div>
-                                    <div class="input-group m-b"><span class="input-group-addon">&yen;</span>
-                                        <input type="text" class="form-control"> <span class="input-group-addon">.00</span>
-                                    </div>
-                                    <div class="input-group m-b"><span class="input-group-addon"> <input type="checkbox"> </span>
-                                        <input type="text" class="form-control">
-                                    </div>
-                                    <div class="input-group"><span class="input-group-addon"> <input type="radio"> </span>
-                                        <input type="text" class="form-control">
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">按钮插件</label>
-
-                                <div class="col-sm-10">
-                                    <div class="input-group m-b"><span class="input-group-btn">
-                                            <button type="button" class="btn btn-primary">搜</button> </span>
-                                        <input type="text" class="form-control">
-                                    </div>
-                                    <div class="input-group">
-                                        <input type="text" class="form-control"> <span class="input-group-btn"> <button type="button" class="btn btn-primary">搜索
-                                        </button> </span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">带下拉框</label>
-
-                                <div class="col-sm-10">
-                                    <div class="input-group m-b">
-                                        <div class="input-group-btn">
-                                            <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">操作 <span class="caret"></span>
-                                            </button>
-                                            <ul class="dropdown-menu">
-                                                <li><a href="form_basic.html#">选项1</a>
-                                                </li>
-                                                <li><a href="form_basic.html#">选项2</a>
-                                                </li>
-                                                <li><a href="form_basic.html#">选项3</a>
-                                                </li>
-                                                <li class="divider"></li>
-                                                <li><a href="form_basic.html#">选项4</a>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                        <input type="text" class="form-control">
-                                    </div>
-                                    <div class="input-group">
-                                        <input type="text" class="form-control">
-
-                                        <div class="input-group-btn">
-                                            <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">操作 <span class="caret"></span>
-                                            </button>
-                                            <ul class="dropdown-menu pull-right">
-                                                <li><a href="form_basic.html#">选项1</a>
-                                                </li>
-                                                <li><a href="form_basic.html#">选项2</a>
-                                                </li>
-                                                <li><a href="form_basic.html#">选项3</a>
-                                                </li>
-                                                <li class="divider"></li>
-                                                <li><a href="form_basic.html#">选项4</a>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label class="col-sm-2 control-label">分段</label>
-
-                                <div class="col-sm-10">
-                                    <div class="input-group m-b">
-                                        <div class="input-group-btn">
-                                            <button tabindex="-1" class="btn btn-white" type="button">操作</button>
-                                            <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button"><span class="caret"></span>
-                                            </button>
-                                            <ul class="dropdown-menu">
-                                                <li><a href="form_basic.html#">选项1</a>
-                                                </li>
-                                                <li><a href="form_basic.html#">选项2</a>
-                                                </li>
-                                                <li><a href="form_basic.html#">选项3</a>
-                                                </li>
-                                                <li class="divider"></li>
-                                                <li><a href="form_basic.html#">选项4</a>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                        <input type="text" class="form-control">
-                                    </div>
-                                    <div class="input-group">
-                                        <input type="text" class="form-control">
-
-                                        <div class="input-group-btn">
-                                            <button tabindex="-1" class="btn btn-white" type="button">操作</button>
-                                            <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button"><span class="caret"></span>
-                                            </button>
-                                            <ul class="dropdown-menu pull-right">
-                                                	分段
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <div class="col-sm-4 col-sm-offset-2">
-                                    <button class="btn btn-primary" type="submit">保存内容</button>
-                                    <button class="btn btn-white" type="submit">取消</button>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div id="modal-form" class="modal fade" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-body">
-                    <div class="row">
-                        <div class="col-sm-6 b-r">
-                            <h3 class="m-t-none m-b">登录</h3>
-
-                            <p>欢迎登录本站(⊙o⊙)</p>
-
-                            <form role="form">
-                                <div class="form-group">
-                                    <label>用户名：</label>
-                                    <input type="email" placeholder="请输入用户名" class="form-control">
-                                </div>
-                                <div class="form-group">
-                                    <label>密码：</label>
-                                    <input type="password" placeholder="请输入密码" class="form-control">
-                                </div>
-                                <div>
-                                    <button class="btn btn-sm btn-primary pull-right m-t-n-xs" type="submit"><strong>登录</strong>
-                                    </button>
-                                    <label>
-                                        <input type="checkbox" class="i-checks">自动登录</label>
-                                </div>
-                            </form>
-                        </div>
-                        <div class="col-sm-6">
-                            <h4>还不是会员？</h4>
-                            <p>您可以注册一个账户</p>
-                            <p class="text-center">
-                                <a href="form_basic.html"><i class="fa fa-sign-in big-icon"></i></a>
-                            </p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/button.html b/ruoyi-admin/src/main/resources/templates/demo/form/button.html
deleted file mode 100644
index 0f4ab4ef7..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/button.html
+++ /dev/null
@@ -1,620 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('按钮')" />
-</head>
-<body class="gray-bg">
-     <div class="row wrapper wrapper-content animated fadeInRight">
-        <div class="col-sm-4">
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5>按钮颜色</h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="buttons.html#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="buttons.html#">选项1</a>
-                            </li>
-                            <li><a href="buttons.html#">选项2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <p>
-                        可使用class来快速改变按钮的颜色，如<code>.btn-primary</code>
-                    </p>
-
-                    <h3 class="font-bold">
-                            普通按钮
-                        </h3>
-                    <p>
-                        <button type="button" class="btn btn-w-m btn-default">btn-default</button>
-                        <button type="button" class="btn btn-w-m btn-primary">btn-primary</button>
-                        <button type="button" class="btn btn-w-m btn-success">btn-success</button>
-                        <button type="button" class="btn btn-w-m btn-info">btn-info</button>
-                        <button type="button" class="btn btn-w-m btn-warning">btn-warning</button>
-                        <button type="button" class="btn btn-w-m btn-danger">btn-danger</button>
-                        <button type="button" class="btn btn-w-m btn-white">btn-white</button>
-                        <button type="button" class="btn btn-w-m btn-link">btn-link</button>
-                    </p>
-                </div>
-            </div>
-        </div>
-        <div class="col-sm-4">
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5>按钮大小</h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="buttons.html#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="buttons.html#">选项1</a>
-                            </li>
-                            <li><a href="buttons.html#">选项2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <p>
-                        可以通过添加class的值为<code>.btn-lg</code>, <code>.btn-sm</code>, or <code>.btn-xs</code>来修改按钮的大小
-                    </p>
-                    <h3 class="font-bold">按钮尺寸</h3>
-                    <p>
-                        <button type="button" class="btn btn-primary btn-lg">大按钮</button>
-                        <button type="button" class="btn btn-default btn-lg">大按钮</button>
-                        <br/>
-                        <button type="button" class="btn btn-primary">默认按钮</button>
-                        <button type="button" class="btn btn-default">默认按钮</button>
-                        <br/>
-                        <button type="button" class="btn btn-primary btn-sm">小按钮</button>
-                        <button type="button" class="btn btn-default btn-sm">小按钮</button>
-                        <br/>
-                        <button type="button" class="btn btn-primary btn-xs">Mini按钮</button>
-                        <button type="button" class="btn btn-default btn-xs">Mini按钮</button>
-                    </p>
-                </div>
-            </div>
-        </div>
-        <div class="col-sm-4">
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5>线性按钮</h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="buttons.html#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="buttons.html#">选项1</a>
-                            </li>
-                            <li><a href="buttons.html#">选项2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <p>
-                        要使用线性按钮，可添加class<code>.btn-block</code>或<code>.btn-outline</code>
-                    </p>
-
-                    <h3 class="font-bold">线性按钮</h3>
-                    <p>
-                        <button type="button" class="btn btn-outline btn-default">默认</button>
-                        <button type="button" class="btn btn-outline btn-primary">主要</button>
-                        <button type="button" class="btn btn-outline btn-success">成功</button>
-                        <button type="button" class="btn btn-outline btn-info">信息</button>
-                        <button type="button" class="btn btn-outline btn-warning">警告</button>
-                        <button type="button" class="btn btn-outline btn-danger">危险</button>
-                        <button type="button" class="btn btn-outline btn-link">链接</button>
-                    </p>
-                    <h3 class="font-bold">块级按钮</h3>
-                    <p>
-                        <button type="button" class="btn btn-block btn-outline btn-primary">这是一个块级按钮</button>
-                    </p>
-                </div>
-            </div>
-        </div>
-        <div class="col-sm-12">
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5>3D按钮</h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="buttons.html#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="buttons.html#">选项1</a>
-                            </li>
-                            <li><a href="buttons.html#">选项2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <p>
-                        可以通过添加<code>.dim</code>class来使用3D按钮.
-                    </p>
-                    <h3 class="font-bold">3D按钮</h3>
-
-                    <button class="btn btn-primary dim btn-large-dim" type="button"><i class="fa fa-money"></i>
-                    </button>
-                    <button class="btn btn-warning dim btn-large-dim" type="button"><i class="fa fa-warning"></i>
-                    </button>
-                    <button class="btn btn-danger  dim btn-large-dim" type="button"><i class="fa fa-heart"></i>
-                    </button>
-                    <button class="btn btn-primary  dim btn-large-dim" type="button"><i class="fa fa-dollar"></i>6</button>
-                    <button class="btn btn-info  dim btn-large-dim btn-outline" type="button"><i class="fa fa-ruble"></i>
-                    </button>
-                    <button class="btn btn-primary dim" type="button"><i class="fa fa-money"></i>
-                    </button>
-                    <button class="btn btn-warning dim" type="button"><i class="fa fa-warning"></i>
-                    </button>
-                    <button class="btn btn-primary dim" type="button"><i class="fa fa-check"></i>
-                    </button>
-                    <button class="btn btn-success  dim" type="button"><i class="fa fa-upload"></i>
-                    </button>
-                    <button class="btn btn-info  dim" type="button"><i class="fa fa-paste"></i>
-                    </button>
-                    <button class="btn btn-warning  dim" type="button"><i class="fa fa-warning"></i>
-                    </button>
-                    <button class="btn btn-default  dim " type="button"><i class="fa fa-star"></i>
-                    </button>
-                    <button class="btn btn-danger  dim " type="button"><i class="fa fa-heart"></i>
-                    </button>
-
-                    <button class="btn btn-outline btn-primary dim" type="button"><i class="fa fa-money"></i>
-                    </button>
-                    <button class="btn btn-outline btn-warning dim" type="button"><i class="fa fa-warning"></i>
-                    </button>
-                    <button class="btn btn-outline btn-primary dim" type="button"><i class="fa fa-check"></i>
-                    </button>
-                    <button class="btn btn-outline btn-success  dim" type="button"><i class="fa fa-upload"></i>
-                    </button>
-                    <button class="btn btn-outline btn-info  dim" type="button"><i class="fa fa-paste"></i>
-                    </button>
-                    <button class="btn btn-outline btn-warning  dim" type="button"><i class="fa fa-warning"></i>
-                    </button>
-                    <button class="btn btn-outline btn-danger  dim " type="button"><i class="fa fa-heart"></i>
-                    </button>
-
-                </div>
-            </div>
-        </div>
-        <div class="col-sm-12">
-            <div class="row">
-                <div class="col-sm-6">
-                    <div class="ibox float-e-margins">
-                        <div class="ibox-title">
-                            <h5>下拉按钮</h5>
-                            <div class="ibox-tools">
-                                <a class="collapse-link">
-                                    <i class="fa fa-chevron-up"></i>
-                                </a>
-                                <a class="dropdown-toggle" data-toggle="dropdown" href="buttons.html#">
-                                    <i class="fa fa-wrench"></i>
-                                </a>
-                                <ul class="dropdown-menu dropdown-user">
-                                    <li><a href="buttons.html#">选项1</a>
-                                    </li>
-                                    <li><a href="buttons.html#">选项2</a>
-                                    </li>
-                                </ul>
-                                <a class="close-link">
-                                    <i class="fa fa-times"></i>
-                                </a>
-                            </div>
-                        </div>
-                        <div class="ibox-content">
-                            <p>
-                                下拉按钮可使用任何颜色任何大小
-                            </p>
-
-                            <h3 class="font-bold">下拉按钮</h3>
-                            <div class="btn-group">
-                                <button data-toggle="dropdown" class="btn btn-primary dropdown-toggle">操作 <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li><a href="buttons.html#">置顶</a>
-                                    </li>
-                                    <li><a href="buttons.html#" class="font-bold">修改</a>
-                                    </li>
-                                    <li><a href="buttons.html#">禁用</a>
-                                    </li>
-                                    <li class="divider"></li>
-                                    <li><a href="buttons.html#">删除</a>
-                                    </li>
-                                </ul>
-                            </div>
-                            <div class="btn-group">
-                                <button data-toggle="dropdown" class="btn btn-warning dropdown-toggle">操作 <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li><a href="buttons.html#">置顶</a>
-                                    </li>
-                                    <li><a href="buttons.html#">修改</a>
-                                    </li>
-                                    <li><a href="buttons.html#">禁用</a>
-                                    </li>
-                                    <li class="divider"></li>
-                                    <li><a href="buttons.html#">删除</a>
-                                    </li>
-                                </ul>
-                            </div>
-                            <div class="btn-group">
-                                <button data-toggle="dropdown" class="btn btn-default dropdown-toggle">操作 <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li><a href="buttons.html#">置顶</a>
-                                    </li>
-                                    <li><a href="buttons.html#" class="font-bold">修改</a>
-                                    </li>
-                                    <li><a href="buttons.html#">禁用</a>
-                                    </li>
-                                    <li class="divider"></li>
-                                    <li><a href="buttons.html#">删除</a>
-                                    </li>
-                                </ul>
-                            </div>
-
-                            <br/>
-                            <div class="btn-group">
-                                <button data-toggle="dropdown" class="btn btn-primary btn-sm dropdown-toggle">操作 <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li><a href="buttons.html#">置顶</a>
-                                    </li>
-                                    <li><a href="buttons.html#" class="font-bold">修改</a>
-                                    </li>
-                                    <li><a href="buttons.html#">禁用</a>
-                                    </li>
-                                    <li class="divider"></li>
-                                    <li><a href="buttons.html#">删除</a>
-                                    </li>
-                                </ul>
-                            </div>
-                            <div class="btn-group">
-                                <button data-toggle="dropdown" class="btn btn-warning btn-sm dropdown-toggle">操作 <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li><a href="buttons.html#">置顶</a>
-                                    </li>
-                                    <li><a href="buttons.html#" class="font-bold">修改</a>
-                                    </li>
-                                    <li><a href="buttons.html#">禁用</a>
-                                    </li>
-                                    <li class="divider"></li>
-                                    <li><a href="buttons.html#">删除</a>
-                                    </li>
-                                </ul>
-                            </div>
-                            <div class="btn-group">
-                                <button data-toggle="dropdown" class="btn btn-default btn-sm dropdown-toggle">操作 <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li><a href="buttons.html#">置顶</a>
-                                    </li>
-                                    <li><a href="buttons.html#" class="font-bold">修改</a>
-                                    </li>
-                                    <li><a href="buttons.html#">禁用</a>
-                                    </li>
-                                    <li class="divider"></li>
-                                    <li><a href="buttons.html#">删除</a>
-                                    </li>
-                                </ul>
-                            </div>
-                            <br/>
-                            <div class="btn-group">
-                                <button data-toggle="dropdown" class="btn btn-primary btn-xs dropdown-toggle">操作 <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li><a href="buttons.html#">置顶</a>
-                                    </li>
-                                    <li><a href="buttons.html#" class="font-bold">修改</a>
-                                    </li>
-                                    <li><a href="buttons.html#">禁用</a>
-                                    </li>
-                                    <li class="divider"></li>
-                                    <li><a href="buttons.html#">删除</a>
-                                    </li>
-                                </ul>
-                            </div>
-                            <div class="btn-group">
-                                <button data-toggle="dropdown" class="btn btn-warning btn-xs dropdown-toggle">操作 <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li><a href="buttons.html#">置顶</a>
-                                    </li>
-                                    <li><a href="buttons.html#" class="font-bold">修改</a>
-                                    </li>
-                                    <li><a href="buttons.html#">禁用</a>
-                                    </li>
-                                    <li class="divider"></li>
-                                    <li><a href="buttons.html#">删除</a>
-                                    </li>
-                                </ul>
-                            </div>
-                            <div class="btn-group">
-                                <button data-toggle="dropdown" class="btn btn-default btn-xs dropdown-toggle">操作 <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li><a href="buttons.html#">置顶</a>
-                                    </li>
-                                    <li><a href="buttons.html#" class="font-bold">修改</a>
-                                    </li>
-                                    <li><a href="buttons.html#">禁用</a>
-                                    </li>
-                                    <li class="divider"></li>
-                                    <li><a href="buttons.html#">删除</a>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="ibox float-e-margins">
-                        <div class="ibox-title">
-                            <h5>按钮组</h5>
-                            <div class="ibox-tools">
-                                <a class="collapse-link">
-                                    <i class="fa fa-chevron-up"></i>
-                                </a>
-                                <a class="dropdown-toggle" data-toggle="dropdown" href="buttons.html#">
-                                    <i class="fa fa-wrench"></i>
-                                </a>
-                                <ul class="dropdown-menu dropdown-user">
-                                    <li><a href="buttons.html#">选项1</a>
-                                    </li>
-                                    <li><a href="buttons.html#">选项2</a>
-                                    </li>
-                                </ul>
-                                <a class="close-link">
-                                    <i class="fa fa-times"></i>
-                                </a>
-                            </div>
-                        </div>
-                        <div class="ibox-content">
-
-                            <h3 class="font-bold">按钮组</h3>
-                            <div class="btn-group">
-                                <button class="btn btn-white" type="button">左</button>
-                                <button class="btn btn-primary" type="button">中</button>
-                                <button class="btn btn-white" type="button">右</button>
-                            </div>
-                            <br/>
-                            <br/>
-                            <div class="btn-group">
-                                <button type="button" class="btn btn-white"><i class="fa fa-chevron-left"></i>
-                                </button>
-                                <button class="btn btn-white">1</button>
-                                <button class="btn btn-white  active">2</button>
-                                <button class="btn btn-white">3</button>
-                                <button class="btn btn-white">4</button>
-                                <button type="button" class="btn btn-white"><i class="fa fa-chevron-right"></i>
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5>图标按钮 </h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link">
-                            <i class="fa fa-chevron-up"></i>
-                        </a>
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="buttons.html#">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <ul class="dropdown-menu dropdown-user">
-                            <li><a href="buttons.html#">选项1</a>
-                            </li>
-                            <li><a href="buttons.html#">选项2</a>
-                            </li>
-                        </ul>
-                        <a class="close-link">
-                            <i class="fa fa-times"></i>
-                        </a>
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <p>
-                        任何按钮都可以在左侧或右侧添加图标
-                    </p>
-
-                    <h3 class="font-bold">图标按钮</h3>
-                    <p>
-                        <button class="btn btn-primary " type="button"><i class="fa fa-check"></i>&nbsp;提交</button>
-                        <button class="btn btn-success " type="button"><i class="fa fa-upload"></i>&nbsp;&nbsp;<span class="bold">上传</span>
-                        </button>
-                        <button class="btn btn-info " type="button"><i class="fa fa-paste"></i> 编辑</button>
-                        <button class="btn btn-warning " type="button"><i class="fa fa-warning"></i> <span class="bold">警告</span>
-                        </button>
-                        <button class="btn btn-default " type="button"><i class="fa fa-map-marker"></i>&nbsp;&nbsp;百度地图</button>
-
-                        <a class="btn btn-success">
-                            <i class="fa fa-weixin"> </i> 分享到微信
-                        </a>
-                        <a class="btn btn-success btn-outline">
-                            <i class="fa fa-qq"> </i> 使用QQ账号登录
-                        </a>
-                        <a class="btn btn-white btn-bitbucket">
-                            <i class="fa fa-user-md"></i>
-                        </a>
-                        <a class="btn btn-white btn-bitbucket">
-                            <i class="fa fa-group"></i>
-                        </a>
-                        <a class="btn btn-white btn-bitbucket">
-                            <i class="fa fa-wrench"></i>
-                        </a>
-                        <a class="btn btn-white btn-bitbucket">
-                            <i class="fa fa-exchange"></i>
-                        </a>
-                        <a class="btn btn-white btn-bitbucket">
-                            <i class="fa fa-check-circle-o"></i>
-                        </a>
-                        <a class="btn btn-white btn-bitbucket">
-                            <i class="fa fa-road"></i>
-                        </a>
-                        <a class="btn btn-white btn-bitbucket">
-                            <i class="fa fa-ambulance"></i>
-                        </a>
-                        <a class="btn btn-white btn-bitbucket">
-                            <i class="fa fa-star"></i> 收藏
-                        </a>
-                    </p>
-
-                    <h3 class="font-bold">按钮切换</h3>
-                    <button data-toggle="button" class="btn btn-primary btn-outline" type="button">按钮1</button>
-                    <button data-toggle="button" class="btn btn-primary" type="button">按钮2</button>
-                    <div data-toggle="buttons-checkbox" class="btn-group">
-                        <button class="btn btn-primary active" type="button"><i class="fa fa-bold"></i> 粗体</button>
-                        <button class="btn btn-primary" type="button"><i class="fa fa-underline"></i> 下划线</button>
-                        <button class="btn btn-primary active" type="button"><i class="fa fa-italic"></i> 斜体</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-sm-12">
-            <div class="row">
-                <div class="col-sm-6">
-                    <div class="ibox float-e-margins">
-                        <div class="ibox-title">
-                            <h5>圆形图标按钮</h5>
-                            <div class="ibox-tools">
-                                <a class="collapse-link">
-                                    <i class="fa fa-chevron-up"></i>
-                                </a>
-                                <a class="dropdown-toggle" data-toggle="dropdown" href="buttons.html#">
-                                    <i class="fa fa-wrench"></i>
-                                </a>
-                                <ul class="dropdown-menu dropdown-user">
-                                    <li><a href="buttons.html#">选项1</a>
-                                    </li>
-                                    <li><a href="buttons.html#">选项2</a>
-                                    </li>
-                                </ul>
-                                <a class="close-link">
-                                    <i class="fa fa-times"></i>
-                                </a>
-                            </div>
-                        </div>
-                        <div class="ibox-content">
-                            <p>
-                                要使用圆形图标按钮，可以通过添加class为<code>.btn-circle</code>实现
-                            </p>
-
-                            <h3 class="font-bold">圆形按钮</h3>
-                            <br/>
-                            <button class="btn btn-default btn-circle" type="button"><i class="fa fa-check"></i>
-                            </button>
-                            <button class="btn btn-primary btn-circle" type="button"><i class="fa fa-list"></i>
-                            </button>
-                            <button class="btn btn-success btn-circle" type="button"><i class="fa fa-link"></i>
-                            </button>
-                            <button class="btn btn-info btn-circle" type="button"><i class="fa fa-check"></i>
-                            </button>
-                            <button class="btn btn-warning btn-circle" type="button"><i class="fa fa-times"></i>
-                            </button>
-                            <button class="btn btn-danger btn-circle" type="button"><i class="fa fa-heart"></i>
-                            </button>
-                            <button class="btn btn-danger btn-circle btn-outline" type="button"><i class="fa fa-heart"></i>
-                            </button>
-                            <br/>
-                            <br/>
-                            <button class="btn btn-default btn-circle btn-lg" type="button"><i class="fa fa-check"></i>
-                            </button>
-                            <button class="btn btn-primary btn-circle btn-lg" type="button"><i class="fa fa-list"></i>
-                            </button>
-                            <button class="btn btn-success btn-circle btn-lg" type="button"><i class="fa fa-link"></i>
-                            </button>
-                            <button class="btn btn-info btn-circle btn-lg" type="button"><i class="fa fa-check"></i>
-                            </button>
-                            <button class="btn btn-warning btn-circle btn-lg" type="button"><i class="fa fa-times"></i>
-                            </button>
-                            <button class="btn btn-danger btn-circle btn-lg" type="button"><i class="fa fa-heart"></i>
-                            </button>
-                            <button class="btn btn-danger btn-circle btn-lg btn-outline" type="button"><i class="fa fa-heart"></i>
-                            </button>
-
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="ibox float-e-margins">
-                        <div class="ibox-title">
-                            <h5>圆角按钮</h5>
-                            <div class="ibox-tools">
-                                <a class="collapse-link">
-                                    <i class="fa fa-chevron-up"></i>
-                                </a>
-                                <a class="dropdown-toggle" data-toggle="dropdown" href="buttons.html#">
-                                    <i class="fa fa-wrench"></i>
-                                </a>
-                                <ul class="dropdown-menu dropdown-user">
-                                    <li><a href="buttons.html#">选项1</a>
-                                    </li>
-                                    <li><a href="buttons.html#">选项2</a>
-                                    </li>
-                                </ul>
-                                <a class="close-link">
-                                    <i class="fa fa-times"></i>
-                                </a>
-                            </div>
-                        </div>
-                        <div class="ibox-content">
-                            <p>
-                                可以通过添加class的值微<code>.btn-rounded</code>来实现圆角按钮
-                            </p>
-
-                            <h3 class="font-bold">按钮组</h3>
-                            <p>
-                                <a class="btn btn-default btn-rounded" href="buttons.html#">默认</a>
-                                <a class="btn btn-primary btn-rounded" href="buttons.html#">主要</a>
-                                <a class="btn btn-success btn-rounded" href="buttons.html#">成果</a>
-                                <a class="btn btn-info btn-rounded" href="buttons.html#">信息</a>
-                                <a class="btn btn-warning btn-rounded" href="buttons.html#">警告</a>
-                                <a class="btn btn-danger btn-rounded" href="buttons.html#">危险</a>
-                                <a class="btn btn-danger btn-rounded btn-outline" href="buttons.html#">危险</a>
-                                <br/>
-                                <br/>
-                                <a class="btn btn-primary btn-rounded btn-block" href="buttons.html#"><i class="fa fa-info-circle"></i> 圆角块级带图标按钮</a>
-                            </p>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/datetime.html b/ruoyi-admin/src/main/resources/templates/demo/form/datetime.html
deleted file mode 100644
index dcf78ecd4..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/datetime.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('日期和时间')" />
-	<th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="gray-bg">
-      <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>日期选择器 <small>https://github.com/smalot/bootstrap-datetimepicker</small></h5>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="form-group">
-                            <label class="font-noraml">简单示例</label>
-                            <div class="input-group date">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                <input type="text" class="form-control" id="datetimepicker-demo-1" placeholder="yyyy-MM-dd HH:mm">
-                            </div>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">显示年月日</label>
-                            <div class="input-group date">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                <input type="text" class="form-control" id="datetimepicker-demo-2" placeholder="yyyy-MM-dd">
-                            </div>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">显示年月日时分秒</label>
-                            <div class="input-group date">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                <input type="text" class="form-control" id="datetimepicker-demo-3" placeholder="yyyy-MM-dd HH:mm:ss">
-                            </div>
-                        </div>
-                        
-                        <div class="form-group">
-			                <label class="font-noraml">带清空的按钮</label>
-			                <div class="input-group date form_date">
-			                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-			                    <input class="form-control" size="16" type="text" readonly>
-			                    <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
-			                </div>
-			            </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">日期范围选择</label>
-                            <div class="input-daterange input-group">
-                                <input type="text" class="input-sm form-control" id="datetimepicker-startTime" placeholder="yyyy-MM-dd"/>
-                                <span class="input-group-addon">到</span>
-                                <input type="text" class="input-sm form-control" id="datetimepicker-endTime" placeholder="yyyy-MM-dd"/>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="form-group">
-                            <label class="font-noraml">相关参数详细信息</label>
-                            <div><a href="http://doc.ruoyi.vip/#/standard/zjwd?id=bootstrap-datetimepicker" target="_blank">http://doc.ruoyi.vip/#/standard/zjwd?id=bootstrap-datetimepicker</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>日期选择器 <small>https://github.com/sentsin/laydate</small></h5>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="form-group">
-                            <label class="font-noraml">简单示例</label>
-                            <div class="input-group date">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                <input type="text" class="form-control" id="laydate-demo-1" placeholder="yyyy-MM-dd">
-                            </div>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">显示年月日</label>
-                            <div class="input-group date">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                <input type="text" class="form-control" id="laydate-demo-2" placeholder="yyyy-MM-dd">
-                            </div>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">显示年月日时分秒</label>
-                            <div class="input-group date">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                <input type="text" class="form-control" id="laydate-demo-3" placeholder="yyyy-MM-dd HH:mm:ss">
-                            </div>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">单框范围选择</label>
-                            <div class="input-group date">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                <input type="text" class="form-control" id="laydate-demo-4" placeholder="yyyy-MM-dd - yyyy-MM-dd">
-                            </div>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">日期范围选择</label>
-                            <div class="input-daterange input-group">
-                                <input type="text" class="input-sm form-control" id="laydate-startTime" placeholder="yyyy-MM-dd"/>
-                                <span class="input-group-addon">到</span>
-                                <input type="text" class="input-sm form-control" id="laydate-endTime" placeholder="yyyy-MM-dd"/>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="form-group">
-                            <label class="font-noraml">相关参数详细信息</label>
-                            <div><a href="http://doc.ruoyi.vip/#/standard/zjwd?id=laydate" target="_blank">http://doc.ruoyi.vip/#/standard/zjwd?id=laydate</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script type="text/javascript">
-        $(function(){
-        	<!-- datetimepicker示例 -->
-        	$("#datetimepicker-demo-1").datetimepicker();
-        	
-        	$("#datetimepicker-demo-2").datetimepicker({
-       		    format: "yyyy-mm-dd",
-       		    minView: "month",
-       		    autoclose: true
-       		});
-        	
-        	$("#datetimepicker-demo-3").datetimepicker({
-       		    format: "yyyy-mm-dd hh:ii:ss",
-       		    autoclose: true
-       		});
-        	
-        	$('.form_date').datetimepicker({
-        		format: "yyyy-mm-dd",
-       		    minView: "month",
-       		    autoclose: true
-            });
-        	
-        	$("#datetimepicker-startTime").datetimepicker({
-        		format: 'yyyy-mm-dd',
-        		minView: "month",
-        	    todayBtn:  true,
-        	    autoclose: true,
-        		endDate : new Date(),
-        	}).on('changeDate', function(event) {
-        		event.preventDefault();
-        		event.stopPropagation();
-        		var startTime = event.date;
-        		$('#datetimepicker-endTime').datetimepicker('setStartDate', startTime);
-        	});
-        	
-        	$("#datetimepicker-endTime").datetimepicker({
-        		format: 'yyyy-mm-dd',
-        		minView: "month",
-        		todayBtn:  true,
-        		autoclose: true,
-        		endDate : new Date(),
-        	}).on('changeDate', function(event) {
-        		event.preventDefault();
-        		event.stopPropagation();
-        		var endTime = event.date;
-        		$("#datetimepicker-startTime").datetimepicker('setEndDate', endTime);
-        	});
-        	
-        	<!-- laydate示例 -->
-        	layui.use('laydate', function(){
-       		  var laydate = layui.laydate;
-       		  
-       		  laydate.render({
-       		    elem: '#laydate-demo-1'
-       		  });
-       		  
-       		  laydate.render({ 
-       		    elem: '#laydate-demo-2',
-       		    type: 'date'
-       		  });
-       		  
-       		  laydate.render({ 
-       		    elem: '#laydate-demo-3',
-       		    type: 'datetime'
-       		  });
-       		  
-       		  laydate.render({
-       		    elem: '#laydate-demo-4',
-       		    range: true
-       		  });
-       		  
-       		  var startDate = laydate.render({
-		        elem: '#laydate-startTime',
-		        max: $('#laydate-endTime').val(),
-		        theme: 'molv',
-		        trigger: 'click',
-		        done: function(value, date) {
-		            // 结束时间大于开始时间
-		            if (value !== '') {
-		                endDate.config.min.year = date.year;
-		                endDate.config.min.month = date.month - 1;
-		                endDate.config.min.date = date.date;
-		            } else {
-		                endDate.config.min.year = '';
-		                endDate.config.min.month = '';
-		                endDate.config.min.date = '';
-		            }
-		        }
-		      });
-       		
-		      var endDate = laydate.render({
-		        elem: '#laydate-endTime',
-		        min: $('#laydate-startTime').val(),
-		        theme: 'molv',
-		        trigger: 'click',
-		        done: function(value, date) {
-		            // 开始时间小于结束时间
-		            if (value !== '') {
-		                startDate.config.max.year = date.year;
-		                startDate.config.max.month = date.month - 1;
-		                startDate.config.max.date = date.date;
-		            } else {
-		                startDate.config.max.year = '';
-		                startDate.config.max.month = '';
-		                startDate.config.max.date = '';
-		            }
-		        }
-		      });
-       	   });
-        });
-    </script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/duallistbox.html b/ruoyi-admin/src/main/resources/templates/demo/form/duallistbox.html
deleted file mode 100644
index a8a55ddf1..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/duallistbox.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('左右互选组件')" />
-	<th:block th:include="include :: bootstrap-duallistbox-css" />
-</head>
-<body class="gray-bg">
-	<div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="ibox">
-                    <div class="ibox-title">
-                        <h5>双重列表框 <small>https://github.com/istvan-ujjmeszaros/bootstrap-duallistbox</small></h5>
-                    </div>  
-                    <div class="ibox-content">
-                        <p>
-                            Bootstrap Dual Listbox是针对Twitter Bootstrap进行了优化的响应式双列表框。它适用于所有现代浏览器和触摸设备。
-                        </p>
-
-                        <form id="form" action="#" class="wizard-big">
-                            <select class="form-control dual_select" multiple>
-                                <option value="1">若依1</option>
-                                <option value="2">若依2</option>
-                                <option value="3">若依3</option>
-                                <option selected value="4">若依4</option>
-                                <option selected value="5">若依5</option>
-                                <option value="6">若依6</option>
-                                <option value="7">若依7</option>
-                                <option value="8">若依8</option>
-                                <option value="9">若依9</option>
-                                <option value="10">若依10</option>
-                                <option value="11">若依11</option>
-                                <option value="12">若依12</option>
-                            </select>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: bootstrap-duallistbox-js" />
-    <script type="text/javascript">
-	    $('.dual_select').bootstrapDualListbox({
-	    	nonSelectedListLabel: '未有用户',
-            selectedListLabel: '已有用户',
-            preserveSelectionOnMove: 'moved',
-            moveOnSelect: false,           // 出现一个剪头，表示可以一次选择一个
-            filterTextClear: '展示所有',
-            moveSelectedLabel: "添加",
-            moveAllLabel: '添加所有',
-            removeSelectedLabel: "移除",
-            removeAllLabel: '移除所有',
-            infoText: '共{0}个',
-            showFilterInputs: false,       // 是否带搜索
-	        selectorMinimalHeight: 160
-	    });
-    </script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/grid.html b/ruoyi-admin/src/main/resources/templates/demo/form/grid.html
deleted file mode 100644
index 1db0deffd..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/grid.html
+++ /dev/null
@@ -1,432 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('栅格')" />
-</head>
-<body class="gray-bg">
-    <div class="wrapper wrapper-content">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>栅格设置</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="grid_options.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="grid_options.html#">选项1</a>
-                                </li>
-                                <li><a href="grid_options.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-
-                        <p>通过下表可以详细查看 Bootstrap 的栅格系统是如何在多种屏幕设备上工作的。</p>
-                        <div class="table-responsive">
-                            <table class="table table-bordered table-striped">
-                                <thead>
-                                    <tr>
-                                        <th></th>
-                                        <th>
-                                            超小屏幕
-                                            <small>手机 (&lt;768px)</small>
-                                        </th>
-                                        <th>
-                                            小屏幕
-                                            <small>平板 (≥768px)</small>
-                                        </th>
-                                        <th>
-                                            中等屏幕
-                                            <small>桌面显示器 (≥992px)</small>
-                                        </th>
-                                        <th>
-                                            大屏幕
-                                            <small>大桌面显示器 (≥1200px)</small>
-                                        </th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr>
-                                        <th class="text-nowrap">栅格系统行为</th>
-                                        <td>总是水平排列</td>
-                                        <td colspan="3">开始是堆叠在一起的，当大于这些阈值时将变为水平排列C</td>
-                                    </tr>
-                                    <tr>
-                                        <th class="text-nowrap"><code>.container</code> 最大宽度</th>
-                                        <td>None （自动）</td>
-                                        <td>750px</td>
-                                        <td>970px</td>
-                                        <td>1170px</td>
-                                    </tr>
-                                    <tr>
-                                        <th class="text-nowrap">类前缀</th>
-                                        <td><code>.col-xs-</code>
-                                        </td>
-                                        <td><code>.col-sm-</code>
-                                        </td>
-                                        <td><code>.col-md-</code>
-                                        </td>
-                                        <td><code>.col-lg-</code>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <th class="text-nowrap">列（column）数</th>
-                                        <td colspan="4">12</td>
-                                    </tr>
-                                    <tr>
-                                        <th class="text-nowrap">最大列（column）宽</th>
-                                        <td class="text-muted">自动</td>
-                                        <td>~62px</td>
-                                        <td>~81px</td>
-                                        <td>~97px</td>
-                                    </tr>
-                                    <tr>
-                                        <th class="text-nowrap">槽（gutter）宽</th>
-                                        <td colspan="4">30px （每列左右均有 15px）</td>
-                                    </tr>
-                                    <tr>
-                                        <th class="text-nowrap">可嵌套</th>
-                                        <td colspan="4">是</td>
-                                    </tr>
-                                    <tr>
-                                        <th class="text-nowrap">偏移（Offsets）</th>
-                                        <td colspan="4">是</td>
-                                    </tr>
-                                    <tr>
-                                        <th class="text-nowrap">列排序</th>
-                                        <td colspan="4">是</td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-
-
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>从堆叠到水平排列</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="grid_options.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="grid_options.html#">选项1</a>
-                                </li>
-                                <li><a href="grid_options.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-
-                        <p>使用单一的一组 <code>.col-md-*</code> 栅格类，就可以创建一个基本的栅格系统，在手机和平板设备上一开始是堆叠在一起的（超小屏幕到小屏幕这一范围），在桌面（中等）屏幕设备上变为水平排列。所有“列（column）必须放在 ” <code>.row</code> 内。</p>
-                        <div class="row show-grid">
-                            <div class="col-md-1">.col-md-1</div>
-                            <div class="col-md-1">.col-md-1</div>
-                            <div class="col-md-1">.col-md-1</div>
-                            <div class="col-md-1">.col-md-1</div>
-                            <div class="col-md-1">.col-md-1</div>
-                            <div class="col-md-1">.col-md-1</div>
-                            <div class="col-md-1">.col-md-1</div>
-                            <div class="col-md-1">.col-md-1</div>
-                            <div class="col-md-1">.col-md-1</div>
-                            <div class="col-md-1">.col-md-1</div>
-                            <div class="col-md-1">.col-md-1</div>
-                            <div class="col-md-1">.col-md-1</div>
-                        </div>
-                        <div class="row show-grid">
-                            <div class="col-md-8">.col-md-8</div>
-                            <div class="col-md-4">.col-md-4</div>
-                        </div>
-                        <div class="row show-grid">
-                            <div class="col-md-4">.col-md-4</div>
-                            <div class="col-md-4">.col-md-4</div>
-                            <div class="col-md-4">.col-md-4</div>
-                        </div>
-                        <div class="row show-grid">
-                            <div class="col-md-6">.col-md-6</div>
-                            <div class="col-md-6">.col-md-6</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>移动设备和桌面屏幕</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="grid_options.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="grid_options.html#">选项1</a>
-                                </li>
-                                <li><a href="grid_options.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-
-                        <p>是否不希望在小屏幕设备上所有列都堆叠在一起？那就使用针对超小屏幕和中等屏幕设备所定义的类吧，即 <code>.col-xs-*</code> 和 <code>.col-md-*</code>。请看下面的实例，研究一下这些是如何工作的。</p>
-                        <div class="row show-grid">
-                            <div class="col-xs-12 col-md-8">.col-xs-12 .col-md-8</div>
-                            <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
-                        </div>
-                        <div class="row show-grid">
-                            <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
-                            <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
-                            <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
-                        </div>
-                        <div class="row show-grid">
-                            <div class="col-xs-6">.col-xs-6</div>
-                            <div class="col-xs-6">.col-xs-6</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>手机、平板、桌面</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="grid_options.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="grid_options.html#">选项1</a>
-                                </li>
-                                <li><a href="grid_options.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-
-                        <p>在上面案例的基础上，通过使用针对平板设备的 <code>.col-sm-*</code> 类，我们来创建更加动态和强大的布局吧。</p>
-                        <div class="row show-grid">
-                            <div class="col-xs-12 col-sm-6 col-md-8">.col-xs-12 .col-sm-6 .col-md-8</div>
-                            <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
-                        </div>
-                        <div class="row show-grid">
-                            <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div>
-                            <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div>
-                            <!-- Optional: clear the XS cols if their content doesn't match in height -->
-                            <div class="clearfix visible-xs"></div>
-                            <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>多余的列（column）将另起一行排列</h5>
-
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="grid_options.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="grid_options.html#">选项1</a>
-                                </li>
-                                <li><a href="grid_options.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <p>在等宽的4网格中，网格不等高会碰到问题，为了解决这个问题，可使用<code>.clearfix</code>。<a href="grid_options.html#responsive-utilities">响应实用工具类</a>
-                        </p>
-                        <div class="row show-grid">
-                            <div class="col-xs-6 col-sm-3">
-                                .col-xs-6 .col-sm-3
-                                <br>调整窗口大小或者在手机上查看本示例
-                            </div>
-                            <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div>
-
-                            <!-- Add the extra clearfix for only the required viewport -->
-                            <div class="clearfix visible-xs"></div>
-
-                            <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div>
-                            <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>列偏移</h5>
-
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="grid_options.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="grid_options.html#">选项1</a>
-                                </li>
-                                <li><a href="grid_options.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-
-                        <p>使用 <code>.col-md-offset-*</code> 类可以将列向右侧偏移。这些类实际是通过使用 <code>*</code> 选择器为当前元素增加了左侧的边距（margin）。例如，<code>.col-md-offset-4</code> 类将 <code>.col-md-4</code> 元素向右侧偏移了4个列（column）的宽度。</p>
-                        <div class="row show-grid">
-                            <div class="col-md-4">.col-md-4</div>
-                            <div class="col-md-4 col-md-offset-4">.col-md-4 .col-md-offset-4</div>
-                        </div>
-                        <div class="row show-grid">
-                            <div class="col-md-3 col-md-offset-3">.col-md-3 .col-md-offset-3</div>
-                            <div class="col-md-3 col-md-offset-3">.col-md-3 .col-md-offset-3</div>
-                        </div>
-                        <div class="row show-grid">
-                            <div class="col-md-6 col-md-offset-3">.col-md-6 .col-md-offset-3</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>嵌套列</h5>
-
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="grid_options.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="grid_options.html#">选项1</a>
-                                </li>
-                                <li><a href="grid_options.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <p>为了使用内置的栅格系统将内容再次嵌套，可以通过添加一个新的 <code>.row</code> 元素和一系列 <code>.col-sm-*</code> 元素到已经存在的 <code>.col-sm-*</code> 元素内。被嵌套的行（row）所包含的列（column）的个数不能超过12（其实，没有要求你必须占满12列）。</p>
-                        <div class="row show-grid">
-                            <div class="col-md-9">
-                                第一级： .col-md-9
-                                <div class="row show-grid">
-                                    <div class="col-md-6">
-                                        第二级： .col-md-6
-                                    </div>
-                                    <div class="col-md-6">
-                                        第二级： .col-md-6
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>列排序</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="grid_options.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="grid_options.html#">选项1</a>
-                                </li>
-                                <li><a href="grid_options.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <p>通过使用 <code>.col-md-push-*</code> 和 <code>.col-md-pull-*</code> 类就可以很容易的改变列（column）的顺序。</p>
-                        <div class="row show-grid">
-                            <div class="col-md-9 col-md-push-3">.col-md-9 .col-md-push-3</div>
-                            <div class="col-md-3 col-md-pull-9">.col-md-3 .col-md-pull-9</div>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/jasny.html b/ruoyi-admin/src/main/resources/templates/demo/form/jasny.html
deleted file mode 100644
index 25aefb835..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/jasny.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('功能扩展')" />
-	<th:block th:include="include :: jasny-bootstrap-css" />
-</head>
-<body class="gray-bg">
-<div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>文件上传控件 <small>https://github.com/jasny/bootstrap</small></h5>
-                    </div>
-                    <div class="ibox-content">
-                    	<div class="form-group">
-                            <label class="font-noraml">输入组示例</label>
-                            
-	                        <div class="fileinput fileinput-new input-group" data-provides="fileinput">
-	                            <div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i> <span class="fileinput-filename"></span></div>
-	                            <span class="input-group-addon btn btn-white btn-file"><span class="fileinput-new">选择文件</span><span class="fileinput-exists">更改</span><input type="file"></span>
-	                            <a href="#" class="input-group-addon btn btn-white fileinput-exists" data-dismiss="fileinput">清除</a>
-	                        </div>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">按钮示例</label>
-                            <br/>
-	                        <div class="fileinput fileinput-new" data-provides="fileinput">
-	                            <span class="btn btn-white btn-file"><span class="fileinput-new">选择文件</span><span class="fileinput-exists">更改</span><input type="file" name="..."></span>
-	                            <span class="fileinput-filename"></span>
-	                            <a href="#" class="close fileinput-exists" data-dismiss="fileinput" style="float: none">&times;</a>
-	                        </div>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">图片上传示例</label>
-                            <br/>
-	                        <div class="fileinput fileinput-new" data-provides="fileinput">
-					            <div class="fileinput-preview thumbnail" data-trigger="fileinput" style="width: 200px; height: 150px;"></div>
-					            <div>
-					                <span class="btn btn-white btn-file"><span class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span><input type="file"></span>
-					                <a href="#" class="btn btn-white fileinput-exists" data-dismiss="fileinput">清除</a>
-					            </div>
-					        </div>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">图片预览示例</label>
-                            <br/>
-	                        <div class="fileinput fileinput-new" data-provides="fileinput">
-						        <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;">
-						          <img th:src="@{/img/profile.jpg}">
-						        </div>
-						        <div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 200px; max-height: 150px;"></div>
-						        <div>
-						          <span class="btn btn-white btn-file"><span class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span><input type="file"></span>
-						          <a href="#" class="btn btn-white fileinput-exists" data-dismiss="fileinput">清除</a>
-						        </div>
-						      </div>
-                        </div>
-                        <hr>
-                        <div class="form-group">
-                            <label class="font-noraml">相关参数详细信息</label>
-                            <div><a href="http://doc.ruoyi.vip/#/standard/zjwd?id=jasny-bootstrap" target="_blank">http://doc.ruoyi.vip/#/standard/zjwd?id=jasny-bootstrap</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>固定格式文本 <small>https://github.com/jasny/bootstrap</small></h5>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="form-group">
-                            <label class="font-noraml">手机号码格式</label>
-                             <input type="text" class="form-control" data-mask="999-9999-9999" placeholder="请输入手机号码">
-                             <span class="help-block">158-8888-88888</span>
-                       	 </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">电话号码格式</label>
-                            <input type="text" class="form-control" data-mask="9999-9999999" placeholder="请输入电话号码">
-                            <span class="help-block">0730-8888888</span>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">日期格式</label>
-                            <input type="text" class="form-control" data-mask="9999-99-99" placeholder="请输入日期格式">
-                            <span class="help-block">yyyy-mm-dd</span>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">IPV4格式</label>
-                            <input type="text" class="form-control" data-mask="999.999.999.999" placeholder="请输入IP地址">
-                            <span class="help-block">192.168.100.200</span>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">税务代码格式</label>
-                            <input type="text" class="form-control" data-mask="99-9999999" placeholder="请输入税务代码">
-                            <span class="help-block">99-9999999</span>
-                        </div>
-                        <hr>
-                        <div class="form-group">
-                            <label class="font-noraml">相关参数详细信息</label>
-                            <div><a href="http://doc.ruoyi.vip/#/standard/zjwd?id=jasny-bootstrap" target="_blank">http://doc.ruoyi.vip/#/standard/zjwd?id=jasny-bootstrap</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: jasny-bootstrap-js" />
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/select.html b/ruoyi-admin/src/main/resources/templates/demo/form/select.html
deleted file mode 100644
index 297b2b2ad..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/select.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('下拉框')" />
-	<th:block th:include="include :: select2-css" />
-	<th:block th:include="include :: bootstrap-select-css" />
-</head>
-<body class="gray-bg">
-     <form>
-      <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>下拉框 <small>https://github.com/select2/select2</small></h5>
-                    </div>  
-                    <div class="ibox-content">
-                        <div class="form-group">
-                            <label class="font-noraml">单选</label>
-                            <select class="form-control">
-                            	<option value="">--请选择开发语言--</option>
-                            	<option value="Java">Java</option>
-                            	<option value="PHP">PHP</option>
-                            	<option value=".NET">.NET</option>
-                            </select>
-                        </div>
-                        
-                        <div class="form-group">
-                             <label class="font-noraml">分组单选</label>
-                             <select class="form-control">
-                               <optgroup label="--请选择开发语言--">
-								 <option value="Java">Java</option>
-                                 <option value="PHP">PHP</option>
-                                 <option value=".NET">.NET</option>
-							   </optgroup>
-							   <optgroup label="--请选择数据库--">
-							     <option value="Oracle">Oracle</option>
-                                 <option value="Mysql">Mysql</option>
-                                 <option value="Sysbase">Sysbase</option>
-						       </optgroup>
-                             </select>
-                        </div>
-						  
-                        <div class="form-group">
-                            <label class="font-noraml">多选</label>
-                            <select class="form-control select2-multiple" multiple>
-                            	<option value="">请选择开发语言</option>
-                            	<option value="Java">Java</option>
-                            	<option value="PHP">PHP</option>
-                            	<option value=".NET">.NET</option>
-                            </select>
-                        </div>
-                        
-                        <div class="form-group">
-                             <label class="font-noraml">分组多选</label>
-                             <select class="form-control select2-multiple" multiple>
-                               <optgroup label="--请选择开发语言--">
-								 <option value="Java">Java</option>
-                                 <option value="PHP">PHP</option>
-                                 <option value=".NET">.NET</option>
-							   </optgroup>
-							   <optgroup label="--请选择数据库--">
-							     <option value="Oracle">Oracle</option>
-                                 <option value="Mysql">Mysql</option>
-                                 <option value="Sysbase">Sysbase</option>
-						       </optgroup>
-                             </select>
-                        </div>
-                        <hr>
-                        <div class="form-group">
-                            <label class="font-noraml">相关参数详细信息</label>
-                            <div><a href="http://doc.ruoyi.vip/#/standard/zjwd?id=select2" target="_blank">http://doc.ruoyi.vip/#/standard/zjwd?id=select2</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>下拉框 <small>https://github.com/snapappointments/bootstrap-select</small></h5>
-                    </div>
-                     <div class="ibox-content">
-                        <div class="form-group">
-                            <label class="font-noraml">单选</label>
-                            <select class="form-control noselect2 selectpicker">
-                            	<option value="">--请选择开发语言--</option>
-                            	<option value="Java">Java</option>
-                            	<option value="PHP">PHP</option>
-                            	<option value=".NET">.NET</option>
-                            </select>
-                        </div>
-                        
-                        <div class="form-group">
-                             <label class="font-noraml">分组多选</label>
-                             <select class="form-control noselect2 selectpicker">
-                               <optgroup label="--请选择开发语言--">
-								 <option value="Java">Java</option>
-                                 <option value="PHP">PHP</option>
-                                 <option value=".NET">.NET</option>
-							   </optgroup>
-							   <optgroup label="--请选择数据库--">
-							     <option value="Oracle">Oracle</option>
-                                 <option value="Mysql">Mysql</option>
-                                 <option value="Sysbase">Sysbase</option>
-						       </optgroup>
-                             </select>
-                        </div>
-						  
-                        <div class="form-group">
-                            <label class="font-noraml">多选</label>
-                            <select class="form-control noselect2 selectpicker" data-none-selected-text="请选择开发语言" multiple>
-                            	<option value="Java">Java</option>
-                            	<option value="PHP">PHP</option>
-                            	<option value=".NET">.NET</option>
-                            </select>
-                        </div>
-                        
-                        <div class="form-group">
-                             <label class="font-noraml">分组多选</label>
-                             <select class="form-control noselect2 selectpicker" data-none-selected-text="请选择" multiple>
-                               <optgroup label="--请选择开发语言--">
-								 <option value="Java">Java</option>
-                                 <option value="PHP">PHP</option>
-                                 <option value=".NET">.NET</option>
-							   </optgroup>
-							   <optgroup label="--请选择数据库--">
-							     <option value="Oracle">Oracle</option>
-                                 <option value="Mysql">Mysql</option>
-                                 <option value="Sysbase">Sysbase</option>
-						       </optgroup>
-                             </select>
-                        </div>
-                        <hr>
-                        <div class="form-group">
-                            <label class="font-noraml">相关参数详细信息</label>
-                            <div><a href="http://doc.ruoyi.vip/#/standard/zjwd?id=bootstrap-select" target="_blank">http://doc.ruoyi.vip/#/standard/zjwd?id=bootstrap-select</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-   </form>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: select2-js" />
-    <th:block th:include="include :: bootstrap-select-js" />
-    <script type="text/javascript">
-        $(function(){
-        	<!-- datetimepicker示例 -->
-        	$("#datetimepicker-demo-1").datetimepicker();
-        	
-        	$("#datetimepicker-demo-2").datetimepicker({
-       		    format: "yyyy-mm-dd",
-       		    minView: "month",
-       		    autoclose: true
-       		});
-        	
-        	$("#datetimepicker-demo-3").datetimepicker({
-       		    format: "yyyy-mm-dd hh:ii:ss",
-       		    autoclose: true
-       		});
-        	
-        	$('.form_date').datetimepicker({
-        		format: "yyyy-mm-dd",
-       		    minView: "month",
-       		    autoclose: true
-            });
-        	
-        	$("#datetimepicker-startTime").datetimepicker({
-        		format: 'yyyy-mm-dd',
-        		minView: "month",
-        	    todayBtn:  true,
-        	    autoclose: true,
-        		endDate : new Date(),
-        	}).on('changeDate', function(event) {
-        		event.preventDefault();
-        		event.stopPropagation();
-        		var startTime = event.date;
-        		$('#datetimepicker-endTime').datetimepicker('setStartDate', startTime);
-        	});
-        	
-        	$("#datetimepicker-endTime").datetimepicker({
-        		format: 'yyyy-mm-dd',
-        		minView: "month",
-        		todayBtn:  true,
-        		autoclose: true,
-        		endDate : new Date(),
-        	}).on('changeDate', function(event) {
-        		event.preventDefault();
-        		event.stopPropagation();
-        		var endTime = event.date;
-        		$("#datetimepicker-startTime").datetimepicker('setEndDate', endTime);
-        	});
-        	
-        	<!-- laydate示例 -->
-        	layui.use('laydate', function(){
-       		  var laydate = layui.laydate;
-       		  
-       		  laydate.render({
-       		    elem: '#laydate-demo-1'
-       		  });
-       		  
-       		  laydate.render({ 
-       		    elem: '#laydate-demo-2',
-       		    type: 'date'
-       		  });
-       		  
-       		  laydate.render({ 
-       		    elem: '#laydate-demo-3',
-       		    type: 'datetime'
-       		  });
-       		  
-       		  laydate.render({
-       		    elem: '#laydate-demo-4',
-       		    range: true
-       		  });
-       		  
-       		  var startDate = laydate.render({
-		        elem: '#laydate-startTime',
-		        max: $('#laydate-endTime').val(),
-		        theme: 'molv',
-		        trigger: 'click',
-		        done: function(value, date) {
-		            // 结束时间大于开始时间
-		            if (value !== '') {
-		                endDate.config.min.year = date.year;
-		                endDate.config.min.month = date.month - 1;
-		                endDate.config.min.date = date.date;
-		            } else {
-		                endDate.config.min.year = '';
-		                endDate.config.min.month = '';
-		                endDate.config.min.date = '';
-		            }
-		        }
-		      });
-       		
-		      var endDate = laydate.render({
-		        elem: '#laydate-endTime',
-		        min: $('#laydate-startTime').val(),
-		        theme: 'molv',
-		        trigger: 'click',
-		        done: function(value, date) {
-		            // 开始时间小于结束时间
-		            if (value !== '') {
-		                startDate.config.max.year = date.year;
-		                startDate.config.max.month = date.month - 1;
-		                startDate.config.max.date = date.date;
-		            } else {
-		                startDate.config.max.year = '';
-		                startDate.config.max.month = '';
-		                startDate.config.max.date = '';
-		            }
-		        }
-		      });
-       	   });
-        });
-    </script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/sortable.html b/ruoyi-admin/src/main/resources/templates/demo/form/sortable.html
deleted file mode 100644
index 3793571b3..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/sortable.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('拖动排序')" />
-</head>
-<body class="gray-bg">
-    <div class="wrapper wrapper-content  animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-4">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h3>任务列表</h3>
-                        <p class="small"><i class="fa fa-hand-o-up"></i> 在列表之间拖动任务面板</p>
-
-                        <div class="input-group">
-                            <input type="text" placeholder="添加新任务" class="input input-sm form-control">
-                            <span class="input-group-btn">
-                                        <button type="button" class="btn btn-sm btn-white"> <i class="fa fa-plus"></i> 添加</button>
-                                </span>
-                        </div>
-
-                        <ul class="sortable-list connectList agile-list">
-                            <li class="warning-element">
-                                加强过程管理，及时统计教育经费使用情况，做到底码清楚，
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标签</a>
-                                    <i class="fa fa-clock-o"></i> 2018.09.01
-                                </div>
-                            </li>
-                            <li class="success-element">
-                                支持财会人员的继续培训工作。
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标记</a>
-                                    <i class="fa fa-clock-o"></i> 2018.05.12
-                                </div>
-                            </li>
-                            <li class="info-element">
-                                协同教导处搞好助学金、减免教科书费的工作。
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标记</a>
-                                    <i class="fa fa-clock-o"></i> 2018.09.10
-                                </div>
-                            </li>
-                            <li class="danger-element">
-                                要求会计、出纳人员严格执行财务制度，遵守岗位职责，按时上报各种资料。
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-primary">确定</a>
-                                    <i class="fa fa-clock-o"></i> 2018.06.10
-                                </div>
-                            </li>
-                            <li class="warning-element">
-                                做好职工公费医疗工作，按时发放门诊费。
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标签</a>
-                                    <i class="fa fa-clock-o"></i> 2018.09.09
-                                </div>
-                            </li>
-                            <li class="warning-element">
-                                有计划地把课本复习三至五遍。
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-primary">确定</a>
-                                    <i class="fa fa-clock-o"></i> 2018.08.04
-                                </div>
-                            </li>
-                            <li class="success-element">
-                                看一本高质量的高中语法书
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标记</a>
-                                    <i class="fa fa-clock-o"></i> 2018.05.12
-                                </div>
-                            </li>
-                            <li class="info-element">
-                                选择一份较好的英语报纸，通过阅读提高英语学习效果。
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标记</a>
-                                    <i class="fa fa-clock-o"></i> 2018.09.10
-                                </div>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-4">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h3>进行中</h3>
-                        <p class="small"><i class="fa fa-hand-o-up"></i> 在列表之间拖动任务面板</p>
-                        <ul class="sortable-list connectList agile-list">
-                            <li class="success-element">
-                                全面、较深入地掌握我们“产品”的功能、特色和优势并做到应用自如。
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标签</a>
-                                    <i class="fa fa-clock-o"></i> 2018.09.01
-                                </div>
-                            </li>
-                            <li class="success-element">
-                                根据自己以前所了解的和从其他途径搜索到的信息，录入客户资料150家。
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标记</a>
-                                    <i class="fa fa-clock-o"></i> 2018.05.12
-                                </div>
-                            </li>
-                            <li class="warning-element">
-                                锁定有意向客户20家。
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标记</a>
-                                    <i class="fa fa-clock-o"></i> 2018.09.10
-                                </div>
-                            </li>
-                            <li class="warning-element">
-                                力争完成销售指标。
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标签</a>
-                                    <i class="fa fa-clock-o"></i> 2018.09.09
-                                </div>
-                            </li>
-                            <li class="info-element">
-                                在总结和摸索中前进。
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-primary">确定</a>
-                                    <i class="fa fa-clock-o"></i> 2018.08.04
-                                </div>
-                            </li>
-                            <li class="success-element">
-                                不断学习行业知识、产品知识，为客户带来实用介绍内容
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标记</a>
-                                    <i class="fa fa-clock-o"></i> 2018.05.12
-                                </div>
-                            </li>
-                            <li class="danger-element">
-                                先友后单：与客户发展良好友谊，转换销售员角色，处处为客户着想
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标记</a>
-                                    <i class="fa fa-clock-o"></i> 2018.11.04
-                                </div>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-4">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h3>已完成</h3>
-                        <p class="small"><i class="fa fa-hand-o-up"></i> 在列表之间拖动任务面板</p>
-                        <ul class="sortable-list connectList agile-list">
-                            <li class="info-element">
-                                制定工作日程表
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标记</a>
-                                    <i class="fa fa-clock-o"></i> 2018.09.10
-                                </div>
-                            </li>
-                            <li class="warning-element">
-                                每天坚持打40个有效电话，挖掘潜在客户
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标签</a>
-                                    <i class="fa fa-clock-o"></i> 2018.09.09
-                                </div>
-                            </li>
-                            <li class="warning-element">
-                                拜访客户之前要对该客户做全面的了解(客户的潜在需求、职位、权限以及个人性格和爱好)
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标签</a>
-                                    <i class="fa fa-clock-o"></i> 2018.09.09
-                                </div>
-                            </li>
-                            <li class="warning-element">
-                                提高自己电话营销技巧，灵活专业地与客户进行电话交流
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-primary">确定</a>
-                                    <i class="fa fa-clock-o"></i> 2018.08.04
-                                </div>
-                            </li>
-                            <li class="success-element">
-                                通过电话销售过程中了解各盛市的设备仪器使用、采购情况及相关重要追踪人
-                                <div class="agile-detail">
-                                    <a href="#" class="pull-right btn btn-xs btn-white">标记</a>
-                                    <i class="fa fa-clock-o"></i> 2018.05.12
-                                </div>
-                            </li>
-
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:src="@{/js/jquery-ui-1.10.4.min.js}"></script>
-    <script>
-	    $(document).ready(function () {
-	        $(".sortable-list").sortable({connectWith: ".connectList"}).disableSelection()
-	    });
-    </script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/tabs_panels.html b/ruoyi-admin/src/main/resources/templates/demo/form/tabs_panels.html
deleted file mode 100644
index e7a8fa7fc..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/tabs_panels.html
+++ /dev/null
@@ -1,353 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('选项卡 & 面板')" />
-</head>
-<body class="gray-bg">
-    <div class="wrapper wrapper-content animated fadeIn">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>基本面板 <small class="m-l-sm">这是一个自定义面板</small></h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="tabs_panels.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="tabs_panels.html#">选项1</a>
-                                </li>
-                                <li><a href="tabs_panels.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <h2>
-                            Bootstrap<br/>
-                        </h2>
-                        <p>
-                            简洁、直观、强悍的前端开发框架，让web开发更迅速、简单。</p>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="tabs-container">
-                    <ul class="nav nav-tabs">
-                        <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true"> 第一个选项卡</a>
-                        </li>
-                        <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">第二个选项卡</a>
-                        </li>
-                    </ul>
-                    <div class="tab-content">
-                        <div id="tab-1" class="tab-pane active">
-                            <div class="panel-body">
-                                <strong>HTML5 文档类型</strong>
-                                <p>Bootstrap 使用到的某些 HTML 元素和 CSS 属性需要将页面设置为 HTML5 文档类型。在你项目中的每个页面都要参照下面的格式进行设置。</p>
-                            </div>
-                        </div>
-                        <div id="tab-2" class="tab-pane">
-                            <div class="panel-body">
-                                <strong>移动设备优先</strong>
-                                <p>在 Bootstrap 2 中，我们对框架中的某些关键部分增加了对移动设备友好的样式。而在 Bootstrap 3 中，我们重写了整个框架，使其一开始就是对移动设备友好的。这次不是简单的增加一些可选的针对移动设备的样式，而是直接融合进了框架的内核中。也就是说，Bootstrap 是移动设备优先的。针对移动设备的样式融合进了框架的每个角落，而不是增加一个额外的文件。</p>
-                            </div>
-                        </div>
-                    </div>
-
-
-                </div>
-            </div>
-
-            <div class="col-sm-6">
-                <div class="panel blank-panel">
-
-                    <div class="panel-heading">
-                        <div class="panel-title m-b-md">
-                            <h4>图标选项卡</h4>
-                        </div>
-                        <div class="panel-options">
-
-                            <ul class="nav nav-tabs">
-                                <li class="active"><a data-toggle="tab" href="tabs_panels.html#tab-4"><i class="fa fa-laptop"></i></a>
-                                </li>
-                                <li class=""><a data-toggle="tab" href="tabs_panels.html#tab-5"><i class="fa fa-desktop"></i></a>
-                                </li>
-                                <li class=""><a data-toggle="tab" href="tabs_panels.html#tab-6"><i class="fa fa-signal"></i></a>
-                                </li>
-                                <li class=""><a data-toggle="tab" href="tabs_panels.html#tab-7"><i class="fa fa-bar-chart-o"></i></a>
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-
-                    <div class="panel-body">
-                        <div class="tab-content">
-                            <div id="tab-4" class="tab-pane active">
-                                <strong>排版与链接</strong>
-
-                                <p>Bootstrap 排版、链接样式设置了基本的全局样式。分别是： 为 body 元素设置 background-color: #fff; 使用 @font-family-base、@font-size-base 和 @line-height-base a变量作为排版的基本参数 为所有链接设置了基本颜色 @link-color ，并且当链接处于 :hover 状态时才添加下划线 这些样式都能在 scaffolding.less 文件中找到对应的源码。</p>
-                            </div>
-
-                            <div id="tab-5" class="tab-pane">
-                                <strong>Normalize.css</strong>
-
-                                <p>为了增强跨浏览器表现的一致性，我们使用了 Normalize.css，这是由 Nicolas Gallagher 和 Jonathan Neal 维护的一个CSS 重置样式库。</p>
-                            </div>
-                            <div id="tab-6" class="tab-pane">
-                                <strong>布局容器</strong>
-
-                                <p>Bootstrap 需要为页面内容和栅格系统包裹一个 .container 容器。我们提供了两个作此用处的类。注意，由于 padding 等属性的原因，这两种 容器类不能互相嵌套。</p>
-                            </div>
-                            <div id="tab-7" class="tab-pane">
-                                <strong>栅格系统</strong>
-
-                                <p>Bootstrap 提供了一套响应式、移动设备优先的流式栅格系统，随着屏幕或视口（viewport）尺寸的增加，系统会自动分为最多12列。它包含了易于使用的预定义类，还有强大的mixin 用于生成更具语义的布局。</p>
-                            </div>
-                        </div>
-
-                    </div>
-
-                </div>
-            </div>
-        </div>
-        <div class="row m-b-lg">
-            <div class="col-sm-6">
-                <div class="tabs-container">
-
-                    <div class="tabs-left">
-                        <ul class="nav nav-tabs">
-                            <li class="active"><a data-toggle="tab" href="#tab-8"> 第一个选项卡</a>
-                            </li>
-                            <li class=""><a data-toggle="tab" href="#tab-9"> 第二个选项卡</a>
-                            </li>
-                        </ul>
-                        <div class="tab-content ">
-                            <div id="tab-8" class="tab-pane active">
-                                <div class="panel-body">
-                                    <strong>排版与链接</strong>
-
-                                    <p>Bootstrap 排版、链接样式设置了基本的全局样式。分别是： 为 body 元素设置 background-color: #fff; 使用 @font-family-base、@font-size-base 和 @line-height-base a变量作为排版的基本参数 为所有链接设置了基本颜色 @link-color ，并且当链接处于 :hover 状态时才添加下划线 这些样式都能在 scaffolding.less 文件中找到对应的源码。</p>
-                                </div>
-                            </div>
-                            <div id="tab-9" class="tab-pane">
-                                <div class="panel-body">
-                                    <strong>栅格系统</strong>
-
-                                    <p>Bootstrap 提供了一套响应式、移动设备优先的流式栅格系统，随着屏幕或视口（viewport）尺寸的增加，系统会自动分为最多12列。它包含了易于使用的预定义类，还有强大的mixin 用于生成更具语义的布局。</p>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="tabs-container">
-                    <div class="tabs-right">
-                        <ul class="nav nav-tabs">
-                            <li class="active"><a data-toggle="tab" href="#tab-10">第一个选项卡</a>
-                            </li>
-                            <li class=""><a data-toggle="tab" href="#tab-11"> 第二个选项卡</a>
-                            </li>
-                        </ul>
-                        <div class="tab-content ">
-                            <div id="tab-10" class="tab-pane active">
-                                <div class="panel-body">
-                                    <strong>排版与链接</strong>
-
-                                    <p>Bootstrap 排版、链接样式设置了基本的全局样式。分别是： 为 body 元素设置 background-color: #fff; 使用 @font-family-base、@font-size-base 和 @line-height-base a变量作为排版的基本参数 为所有链接设置了基本颜色 @link-color ，并且当链接处于 :hover 状态时才添加下划线 这些样式都能在 scaffolding.less 文件中找到对应的源码。</p>
-                                </div>
-                            </div>
-                            <div id="tab-11" class="tab-pane">
-                                <div class="panel-body">
-                                    <strong>栅格系统</strong>
-
-                                    <p>Bootstrap 提供了一套响应式、移动设备优先的流式栅格系统，随着屏幕或视口（viewport）尺寸的增加，系统会自动分为最多12列。它包含了易于使用的预定义类，还有强大的mixin 用于生成更具语义的布局。</p>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox">
-                    <div class="ibox-title">
-                        <h5>Bootstrap面板 <small>自定义背景</small></h5>
-                    </div>
-                    <div class="ibox-content">
-
-                        <div class="row">
-                            <div class="col-sm-4">
-                                <div class="panel panel-default">
-                                    <div class="panel-heading">
-                                        默认面板
-                                    </div>
-                                    <div class="panel-body">
-                                        <p>通过 .panel-heading 可以很简单地为面板加入一个标题容器。你也可以通过添加设置了 .panel-title 类的标签，添加一个预定义样式的标题。 为了给链接设置合适的颜色，务必将链接放到带有 .panel-title 类的标题标签内。</p>
-                                    </div>
-
-                                </div>
-                            </div>
-                            <div class="col-sm-4">
-                                <div class="panel panel-primary">
-                                    <div class="panel-heading">
-                                        主要
-                                    </div>
-                                    <div class="panel-body">
-                                        <p>通过 .panel-heading 可以很简单地为面板加入一个标题容器。你也可以通过添加设置了 .panel-title 类的标签，添加一个预定义样式的标题。 为了给链接设置合适的颜色，务必将链接放到带有 .panel-title 类的标题标签内。</p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-sm-4">
-                                <div class="panel panel-success">
-                                    <div class="panel-heading">
-                                        成功
-                                    </div>
-                                    <div class="panel-body">
-                                        <p>通过 .panel-heading 可以很简单地为面板加入一个标题容器。你也可以通过添加设置了 .panel-title 类的标签，添加一个预定义样式的标题。 为了给链接设置合适的颜色，务必将链接放到带有 .panel-title 类的标题标签内。</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-sm-4">
-                                <div class="panel panel-info">
-                                    <div class="panel-heading">
-                                        <i class="fa fa-info-circle"></i> 信息
-                                    </div>
-                                    <div class="panel-body">
-                                        <p>通过 .panel-heading 可以很简单地为面板加入一个标题容器。你也可以通过添加设置了 .panel-title 类的标签，添加一个预定义样式的标题。 为了给链接设置合适的颜色，务必将链接放到带有 .panel-title 类的标题标签内。</p>
-                                    </div>
-
-                                </div>
-                            </div>
-                            <div class="col-sm-4">
-                                <div class="panel panel-warning">
-                                    <div class="panel-heading">
-                                        <i class="fa fa-warning"></i> 警告
-                                    </div>
-                                    <div class="panel-body">
-                                        <p>通过 .panel-heading 可以很简单地为面板加入一个标题容器。你也可以通过添加设置了 .panel-title 类的标签，添加一个预定义样式的标题。 为了给链接设置合适的颜色，务必将链接放到带有 .panel-title 类的标题标签内。</p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-sm-4">
-                                <div class="panel panel-danger">
-                                    <div class="panel-heading">
-                                        危险
-                                    </div>
-                                    <div class="panel-body">
-                                        <p>通过 .panel-heading 可以很简单地为面板加入一个标题容器。你也可以通过添加设置了 .panel-title 类的标签，添加一个预定义样式的标题。 为了给链接设置合适的颜色，务必将链接放到带有 .panel-title 类的标题标签内。</p>
-                                    </div>
-                                    <div class="panel-footer">
-                                        面板Footer
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>折叠面板</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="tabs_panels.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="tabs_panels.html#">选项1</a>
-                                </li>
-                                <li><a href="tabs_panels.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="panel-body">
-                            <div class="panel-group" id="accordion">
-                                <div class="panel panel-default">
-                                    <div class="panel-heading">
-                                        <h5 class="panel-title">
-                                                <a data-toggle="collapse" data-parent="#accordion" href="tabs_panels.html#collapseOne">标题 #1</a>
-                                            </h5>
-                                    </div>
-                                    <div id="collapseOne" class="panel-collapse collapse in">
-                                        <div class="panel-body">
-                                            Bootstrap相关优质项目推荐 这些项目或者是对Bootstrap进行了有益的补充，或者是基于Bootstrap开发的
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="panel panel-default">
-                                    <div class="panel-heading">
-                                        <h4 class="panel-title">
-                                                <a data-toggle="collapse" data-parent="#accordion" href="tabs_panels.html#collapseTwo">标题 #2</a>
-                                            </h4>
-                                    </div>
-                                    <div id="collapseTwo" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            Bootstrap相关优质项目推荐 这些项目或者是对Bootstrap进行了有益的补充，或者是基于Bootstrap开发的
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="panel panel-default">
-                                    <div class="panel-heading">
-                                        <h4 class="panel-title">
-                                                <a data-toggle="collapse" data-parent="#accordion" href="tabs_panels.html#collapseThree">标题 #3</a>
-                                            </h4>
-                                    </div>
-                                    <div id="collapseThree" class="panel-collapse collapse">
-                                        <div class="panel-body">
-                                            Bootstrap相关优质项目推荐 这些项目或者是对Bootstrap进行了有益的补充，或者是基于Bootstrap开发的
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="jumbotron">
-                    <h1>超大屏幕</h1>
-                    <p>Bootstrap 支持的另一个特性，超大屏幕（Jumbotron）。顾名思义该组件可以增加标题的大小，并为登陆页面内容添加更多的外边距（margin）。使用超大屏幕（Jumbotron）的步骤如下：</p>
-                    <div class="alert alert-warning">
-                        <ol>
-                            <li>创建一个带有 class .jumbotron. 的容器</li>
-                            <li>除了更大的 &lt;h1&gt;，字体粗细 font-weight 被减为 200px。</li>
-                        </ol>
-                    </div>
-
-                    <p><a role="button" class="btn btn-primary btn-lg">了解更多</a>
-                    </p>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/upload.html b/ruoyi-admin/src/main/resources/templates/demo/form/upload.html
deleted file mode 100644
index 7c78daa34..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/upload.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('文件上传')" />
-	<th:block th:include="include :: bootstrap-fileinput-css" />
-</head>
-<body class="gray-bg">
-<div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>文件上传控件 <small>https://github.com/kartik-v/bootstrap-fileinput</small></h5>
-                    </div>
-                    <div class="ibox-content">
-                    	<div class="form-group">
-                            <label class="font-noraml">简单示例</label>
-	                        <div class="file-loading">
-					            <input class="file" type="file" multiple data-min-file-count="1" data-theme="fas">
-					        </div>
-                        </div>
-                        
-                        <div class="form-group">
-                            <label class="font-noraml">多文件上传</label>
-	                        <div class="file-loading">
-					            <input id="fileinput-demo-1" type="file" multiple>
-					        </div>
-                        </div>
-                        <hr>
-                        <div class="form-group">
-                            <label class="font-noraml">相关参数详细信息</label>
-                            <div><a href="http://doc.ruoyi.vip/#/standard/zjwd?id=jasny-bootstrap" target="_blank">http://doc.ruoyi.vip/#/standard/zjwd?id=jasny-bootstrap</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: bootstrap-fileinput-js" />
-    <script type="text/javascript">
-    $(document).ready(function () {
-        $("#fileinput-demo-1").fileinput({
-            'theme': 'explorer-fas',
-            'uploadUrl': '#',
-            overwriteInitial: false,
-            initialPreviewAsData: true,
-            initialPreview: [
-                "/img/profile.jpg"
-            ]
-        });
-    });
-    </script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/validate.html b/ruoyi-admin/src/main/resources/templates/demo/form/validate.html
deleted file mode 100644
index 35f48fa48..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/validate.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('表单校验')" />
-</head>
-<body class="gray-bg">
-<div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>jQuery Validate 简介</h5>
-                    </div>
-                    <div class="ibox-content">
-                        <p>jquery.validate.js 是一款优秀的jQuery表单验证插件。它具有如下特点：</p>
-                        <ul>
-                            <li>安装简单</li>
-                            <li>内置超过20种数据验证方法</li>
-                            <li>直列错误提示信息</li>
-                            <li>可扩展的数据验证方法</li>
-                            <li>使用内置的元数据或插件选项来指定您的验证规则</li>
-                            <li>优雅的交互设计</li>
-                        </ul>
-                        <p>官网：<a href="http://jqueryvalidation.org/" target="_blank">http://jqueryvalidation.org/</a>
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>简单示例</h5>
-                    </div>
-                    <div class="ibox-content">
-                        <form class="form-horizontal m-t" id="commentForm">
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">姓名：</label>
-                                <div class="col-sm-8">
-                                    <input id="cname" name="name" minlength="2" type="text" class="form-control" required>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">E-mail：</label>
-                                <div class="col-sm-8">
-                                    <input id="cemail" type="email" class="form-control" name="email" required>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">网站：</label>
-                                <div class="col-sm-8">
-                                    <input id="curl" type="url" class="form-control" name="url">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">说明：</label>
-                                <div class="col-sm-8">
-                                    <textarea id="ccomment" name="comment" class="form-control" required></textarea>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <div class="col-sm-4 col-sm-offset-3">
-                                    <button class="btn btn-primary" type="submit">提交</button>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-                <div class="ibox float-e-margins">
-                    <div class="ibox-content">
-                        <p class="m-t">更多示例请访问官方示例页面：<a href="http://jqueryvalidation.org/files/demo/" target="_blank">查看</a>
-                        </p>
-                        <p>中文API可参考：<a href="http://doc.ruoyi.vip/#/standard/zjwd?id=jquery-validate" target="_blank">http://doc.ruoyi.vip/#/standard/zjwd?id=jquery-validate</a>
-                        </p>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>完整验证表单</h5>
-                    </div>
-                    <div class="ibox-content">
-                        <form class="form-horizontal m-t" id="signupForm">
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">姓氏：</label>
-                                <div class="col-sm-8">
-                                    <input id="firstname" name="firstname" class="form-control" type="text">
-                                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 这里写点提示的内容</span>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">名字：</label>
-                                <div class="col-sm-8">
-                                    <input id="lastname" name="lastname" class="form-control" type="text" required>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">用户名：</label>
-                                <div class="col-sm-8">
-                                    <input id="username" name="username" class="form-control" type="text" required>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">密码：</label>
-                                <div class="col-sm-8">
-                                    <input id="password" name="password" class="form-control" type="password">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">确认密码：</label>
-                                <div class="col-sm-8">
-                                    <input id="confirm_password" name="confirm_password" class="form-control" type="password">
-                                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 请再次输入您的密码</span>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">E-mail：</label>
-                                <div class="col-sm-8">
-                                    <input id="email" name="email" class="form-control" type="email">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <div class="col-sm-8 col-sm-offset-3">
-                                    <button class="btn btn-primary" type="submit">提交</button>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script type="text/javascript">
-    $(function(){
-        $("#commentForm").validate();
-
-        var icon = "<i class='fa fa-times-circle'></i> ";
-        $("#signupForm").validate({
-            rules: {
-                firstname: "required",
-                lastname: "required",
-                username: {
-                    required: true,
-                    minlength: 2
-                },
-                password: {
-                    required: true,
-                    minlength: 5
-                },
-                confirm_password: {
-                    required: true,
-                    minlength: 5,
-                    equalTo: "#password"
-                },
-                email: {
-                    required: true,
-                    email: true
-                }
-            },
-            messages: {
-                firstname: icon + "请输入你的姓",
-                lastname: icon + "请输入您的名字",
-                username: {
-                    required: icon + "请输入您的用户名",
-                    minlength: icon + "用户名必须两个字符以上"
-                },
-                password: {
-                    required: icon + "请输入您的密码",
-                    minlength: icon + "密码必须5个字符以上"
-                },
-                confirm_password: {
-                    required: icon + "请再次输入密码",
-                    minlength: icon + "密码必须5个字符以上",
-                    equalTo: icon + "两次输入的密码不一致"
-                },
-                email: icon + "请输入您的E-mail"
-            }
-        });
-
-        $("#username").focus(function () {
-            var firstname = $("#firstname").val();
-            var lastname = $("#lastname").val();
-            if (firstname && lastname && !this.value) {
-                this.value = firstname + "." + lastname;
-            }
-        });
-    });
-    </script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/wizard.html b/ruoyi-admin/src/main/resources/templates/demo/form/wizard.html
deleted file mode 100644
index ac70ed2e3..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/form/wizard.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('基本表单')" />
-	<th:block th:include="include :: jquery-steps-css" />
-</head>
-<body class="gray-bg">
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-5">
-                <div class="jumbotron">
-                    <h1>表单向导</h1>
-                    <p>Smart UI 部件允许您快速创建表单向导接口。</p>
-                    <p><a href="https://github.com/rstaib/jquery-steps" target="_blank" class="btn btn-primary btn-lg" role="button">了解 jQuery Steps</a>
-                    </p>
-                </div>
-            </div>
-            <div class="col-sm-7">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>基础表单向导</h5>
-                    </div>
-                    <div class="ibox-content">
-                        <p>
-                                                                      这是一个简单的表单向导示例
-                        </p>
-                        <div id="wizard">
-                            <h1>第一步</h1>
-                            <div class="step-content">
-                                <div class="text-center m-t-md">
-                                    <h2>第一步</h2>
-                                    <p>
-                                                                                                       这是第一步的内容
-                                    </p>
-                                </div>
-                            </div>
-
-                            <h1>第二步</h1>
-                            <div class="step-content">
-                                <div class="text-center m-t-md">
-                                    <h2>第二步</h2>
-                                    <p>
-                                                                                                       这是第二步的内容
-                                    </p>
-                                </div>
-                            </div>
-
-                            <h1>第三步</h1>
-                            <div class="step-content">
-                                <div class="text-center m-t-md">
-                                    <h2>第三步</h2>
-                                    <p>
-                                                                                                      这是第三步的内容
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox">
-                    <div class="ibox-title">
-                        <h5>带验证的表单向导</h5>
-                    </div>
-                    <div class="ibox-content">
-                        <h2>
-                                                                               带验证的表单向导
-                            </h2>
-                        <p>
-                                                                              下面这个示例展示了如何在表单向导中使用 jQuery Validation 插件
-                        </p>
-
-                        <form id="form" action="http://www.zi-han.net/theme/hplus/form_wizard.html#" class="wizard-big">
-                            <h1>账户</h1>
-                            <fieldset>
-                                <h2>账户信息</h2>
-                                <div class="row">
-                                    <div class="col-sm-8">
-                                        <div class="form-group">
-                                            <label>用户名 *</label>
-                                            <input id="userName" name="userName" type="text" class="form-control required">
-                                        </div>
-                                        <div class="form-group">
-                                            <label>密码 *</label>
-                                            <input id="password" name="password" type="text" class="form-control required">
-                                        </div>
-                                        <div class="form-group">
-                                            <label>确认密码 *</label>
-                                            <input id="confirm" name="confirm" type="text" class="form-control required">
-                                        </div>
-                                    </div>
-                                    <div class="col-sm-4">
-                                        <div class="text-center">
-                                            <div style="margin-top: 20px">
-                                                <i class="fa fa-sign-in" style="font-size: 180px;color: #e5e5e5 "></i>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            </fieldset>
-                            <h1>个人资料</h1>
-                            <fieldset>
-                                <h2>个人资料信息</h2>
-                                <div class="row">
-                                    <div class="col-sm-6">
-                                        <div class="form-group">
-                                            <label>姓名 *</label>
-                                            <input id="name" name="name" type="text" class="form-control required">
-                                        </div>
-                                    </div>
-                                    <div class="col-sm-6">
-                                        <div class="form-group">
-                                            <label>Email *</label>
-                                            <input id="email" name="email" type="text" class="form-control required email">
-                                        </div>
-                                        <div class="form-group">
-                                            <label>地址 *</label>
-                                            <input id="address" name="address" type="text" class="form-control">
-                                        </div>
-                                    </div>
-                                </div>
-                            </fieldset>
-
-                            <h1>警告</h1>
-                            <fieldset>
-                                <div class="text-center" style="margin-top: 120px">
-                                    <h2>你是火星人 :-)</h2>
-                                </div>
-                            </fieldset>
-
-                            <h1>完成</h1>
-                            <fieldset>
-                                <h2>条款</h2>
-                                <input id="acceptTerms" name="acceptTerms" type="checkbox" class="required">
-                                <label for="acceptTerms">我同意注册条款</label>
-                            </fieldset>
-                        </form>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: jquery-steps-js" />
-    <script>
-	    $(document).ready(function () {
-	        $("#wizard").steps();
-	        $("#form").steps({
-	            bodyTag: "fieldset", onStepChanging: function (event, currentIndex, newIndex) {
-	                if (currentIndex > newIndex) {
-	                    return true
-	                }
-	                if (newIndex === 3 && Number($("#age").val()) < 18) {
-	                    return false
-	                }
-	                var form = $(this);
-	                if (currentIndex < newIndex) {
-	                    $(".body:eq(" + newIndex + ") label.error", form).remove();
-	                    $(".body:eq(" + newIndex + ") .error", form).removeClass("error")
-	                }
-	                form.validate().settings.ignore = ":disabled,:hidden";
-	                return form.valid()
-	            }, onStepChanged: function (event, currentIndex, priorIndex) {
-	                if (currentIndex === 2 && Number($("#age").val()) >= 18) {
-	                    $(this).steps("next")
-	                }
-	                if (currentIndex === 2 && priorIndex === 3) {
-	                    $(this).steps("previous")
-	                }
-	            }, onFinishing: function (event, currentIndex) {
-	                var form = $(this);
-	                form.validate().settings.ignore = ":disabled";
-	                return form.valid()
-	            }, onFinished: function (event, currentIndex) {
-	                var form = $(this);
-	                form.submit()
-	            }
-	        }).validate({
-	            errorPlacement: function (error, element) {
-	                element.before(error)
-	            }, rules: {confirm: {equalTo: "#password"}}
-	        })
-	    });
-	</script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/icon/fontawesome.html b/ruoyi-admin/src/main/resources/templates/demo/icon/fontawesome.html
deleted file mode 100644
index 7206094af..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/icon/fontawesome.html
+++ /dev/null
@@ -1,1944 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('fontawesome图标')" />
-</head>
-<body class="gray-bg">
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-3">
-                <div class="float-e-margins">
-                    <h2>Font Awesome 4.4.0</h2> 字体图标的最佳集合。提供可伸缩矢量图标，可以立即进行定制大小、颜色、阴影，所有都可以用CSS样式来完成。
-                </div>
-            </div>
-            <div class="col-sm-9">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>所有图标 <small class="m-l-sm">所有图标集合 - <a target="_blank" href="http://fortawesome.github.io/Font-Awesome/icons/">Font Awesome</a> </small></h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="icons.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="icons.html#">选项1</a>
-                                </li>
-                                <li><a href="icons.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content icons-box">
-                        <section id="new">
-                            <h2 class="page-header">4.4版新增的66个图标</h2>
-
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#500px"><i class="fa fa-500px"></i> 500px</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#amazon"><i class="fa fa-amazon"></i> amazon</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#balance-scale"><i class="fa fa-balance-scale"></i> balance-scale</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-empty"><i class="fa fa-battery-0"></i> battery-0 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-quarter"><i class="fa fa-battery-1"></i> battery-1 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-half"><i class="fa fa-battery-2"></i> battery-2 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-three-quarters"><i class="fa fa-battery-3"></i> battery-3 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-full"><i class="fa fa-battery-4"></i> battery-4 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-empty"><i class="fa fa-battery-empty"></i> battery-empty</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-full"><i class="fa fa-battery-full"></i> battery-full</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-half"><i class="fa fa-battery-half"></i> battery-half</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-quarter"><i class="fa fa-battery-quarter"></i> battery-quarter</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-three-quarters"><i class="fa fa-battery-three-quarters"></i> battery-three-quarters</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#black-tie"><i class="fa fa-black-tie"></i> black-tie</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#calendar-check-o"><i class="fa fa-calendar-check-o"></i> calendar-check-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#calendar-minus-o"><i class="fa fa-calendar-minus-o"></i> calendar-minus-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#calendar-plus-o"><i class="fa fa-calendar-plus-o"></i> calendar-plus-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#calendar-times-o"><i class="fa fa-calendar-times-o"></i> calendar-times-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-diners-club"><i class="fa fa-cc-diners-club"></i> cc-diners-club</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-jcb"><i class="fa fa-cc-jcb"></i> cc-jcb</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#chrome"><i class="fa fa-chrome"></i> chrome</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#clone"><i class="fa fa-clone"></i> clone</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#commenting"><i class="fa fa-commenting"></i> commenting</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#commenting-o"><i class="fa fa-commenting-o"></i> commenting-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#contao"><i class="fa fa-contao"></i> contao</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#creative-commons"><i class="fa fa-creative-commons"></i> creative-commons</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#expeditedssl"><i class="fa fa-expeditedssl"></i> expeditedssl</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#firefox"><i class="fa fa-firefox"></i> firefox</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#fonticons"><i class="fa fa-fonticons"></i> fonticons</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#genderless"><i class="fa fa-genderless"></i> genderless</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#get-pocket"><i class="fa fa-get-pocket"></i> get-pocket</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gg"><i class="fa fa-gg"></i> gg</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gg-circle"><i class="fa fa-gg-circle"></i> gg-circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-rock-o"><i class="fa fa-hand-grab-o"></i> hand-grab-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-lizard-o"><i class="fa fa-hand-lizard-o"></i> hand-lizard-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-paper-o"><i class="fa fa-hand-paper-o"></i> hand-paper-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-peace-o"><i class="fa fa-hand-peace-o"></i> hand-peace-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-pointer-o"><i class="fa fa-hand-pointer-o"></i> hand-pointer-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-rock-o"><i class="fa fa-hand-rock-o"></i> hand-rock-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-scissors-o"><i class="fa fa-hand-scissors-o"></i> hand-scissors-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-spock-o"><i class="fa fa-hand-spock-o"></i> hand-spock-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-paper-o"><i class="fa fa-hand-stop-o"></i> hand-stop-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass"><i class="fa fa-hourglass"></i> hourglass</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-start"><i class="fa fa-hourglass-1"></i> hourglass-1 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-half"><i class="fa fa-hourglass-2"></i> hourglass-2 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-end"><i class="fa fa-hourglass-3"></i> hourglass-3 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-end"><i class="fa fa-hourglass-end"></i> hourglass-end</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-half"><i class="fa fa-hourglass-half"></i> hourglass-half</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-o"><i class="fa fa-hourglass-o"></i> hourglass-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-start"><i class="fa fa-hourglass-start"></i> hourglass-start</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#houzz"><i class="fa fa-houzz"></i> houzz</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#i-cursor"><i class="fa fa-i-cursor"></i> i-cursor</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#industry"><i class="fa fa-industry"></i> industry</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#internet-explorer"><i class="fa fa-internet-explorer"></i> internet-explorer</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#map"><i class="fa fa-map"></i> map</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#map-o"><i class="fa fa-map-o"></i> map-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#map-pin"><i class="fa fa-map-pin"></i> map-pin</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#map-signs"><i class="fa fa-map-signs"></i> map-signs</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#mouse-pointer"><i class="fa fa-mouse-pointer"></i> mouse-pointer</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#object-group"><i class="fa fa-object-group"></i> object-group</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#object-ungroup"><i class="fa fa-object-ungroup"></i> object-ungroup</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#odnoklassniki"><i class="fa fa-odnoklassniki"></i> odnoklassniki</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#odnoklassniki-square"><i class="fa fa-odnoklassniki-square"></i> odnoklassniki-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#opencart"><i class="fa fa-opencart"></i> opencart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#opera"><i class="fa fa-opera"></i> opera</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#optin-monster"><i class="fa fa-optin-monster"></i> optin-monster</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#registered"><i class="fa fa-registered"></i> registered</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#safari"><i class="fa fa-safari"></i> safari</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sticky-note"><i class="fa fa-sticky-note"></i> sticky-note</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sticky-note-o"><i class="fa fa-sticky-note-o"></i> sticky-note-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#television"><i class="fa fa-television"></i> television</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#trademark"><i class="fa fa-trademark"></i> trademark</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tripadvisor"><i class="fa fa-tripadvisor"></i> tripadvisor</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#television"><i class="fa fa-tv"></i> tv <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#vimeo"><i class="fa fa-vimeo"></i> vimeo</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#wikipedia-w"><i class="fa fa-wikipedia-w"></i> wikipedia-w</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#y-combinator"><i class="fa fa-y-combinator"></i> y-combinator</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#y-combinator"><i class="fa fa-yc"></i> yc <span class="text-muted">(alias)</span></a></div>
-
-                            </div>
-
-                        </section>
-                        <section id="web-application">
-                            <h2 class="page-header">Web应用程序图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#adjust"><i class="fa fa-adjust"></i> adjust</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#anchor"><i class="fa fa-anchor"></i> anchor</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#archive"><i class="fa fa-archive"></i> archive</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#area-chart"><i class="fa fa-area-chart"></i> area-chart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrows"><i class="fa fa-arrows"></i> arrows</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrows-h"><i class="fa fa-arrows-h"></i> arrows-h</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrows-v"><i class="fa fa-arrows-v"></i> arrows-v</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#asterisk"><i class="fa fa-asterisk"></i> asterisk</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#at"><i class="fa fa-at"></i> at</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#car"><i class="fa fa-automobile"></i> automobile <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#balance-scale"><i class="fa fa-balance-scale"></i> balance-scale</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#ban"><i class="fa fa-ban"></i> ban</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#university"><i class="fa fa-bank"></i> bank <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bar-chart"><i class="fa fa-bar-chart"></i> bar-chart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bar-chart"><i class="fa fa-bar-chart-o"></i> bar-chart-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#barcode"><i class="fa fa-barcode"></i> barcode</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bars"><i class="fa fa-bars"></i> bars</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-empty"><i class="fa fa-battery-0"></i> battery-0 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-quarter"><i class="fa fa-battery-1"></i> battery-1 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-half"><i class="fa fa-battery-2"></i> battery-2 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-three-quarters"><i class="fa fa-battery-3"></i> battery-3 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-full"><i class="fa fa-battery-4"></i> battery-4 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-empty"><i class="fa fa-battery-empty"></i> battery-empty</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-full"><i class="fa fa-battery-full"></i> battery-full</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-half"><i class="fa fa-battery-half"></i> battery-half</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-quarter"><i class="fa fa-battery-quarter"></i> battery-quarter</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#battery-three-quarters"><i class="fa fa-battery-three-quarters"></i> battery-three-quarters</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bed"><i class="fa fa-bed"></i> bed</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#beer"><i class="fa fa-beer"></i> beer</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bell"><i class="fa fa-bell"></i> bell</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bell-o"><i class="fa fa-bell-o"></i> bell-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bell-slash"><i class="fa fa-bell-slash"></i> bell-slash</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bell-slash-o"><i class="fa fa-bell-slash-o"></i> bell-slash-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bicycle"><i class="fa fa-bicycle"></i> bicycle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#binoculars"><i class="fa fa-binoculars"></i> binoculars</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#birthday-cake"><i class="fa fa-birthday-cake"></i> birthday-cake</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bolt"><i class="fa fa-bolt"></i> bolt</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bomb"><i class="fa fa-bomb"></i> bomb</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#book"><i class="fa fa-book"></i> book</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bookmark"><i class="fa fa-bookmark"></i> bookmark</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bookmark-o"><i class="fa fa-bookmark-o"></i> bookmark-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#briefcase"><i class="fa fa-briefcase"></i> briefcase</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bug"><i class="fa fa-bug"></i> bug</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#building"><i class="fa fa-building"></i> building</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#building-o"><i class="fa fa-building-o"></i> building-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bullhorn"><i class="fa fa-bullhorn"></i> bullhorn</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bullseye"><i class="fa fa-bullseye"></i> bullseye</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bus"><i class="fa fa-bus"></i> bus</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#taxi"><i class="fa fa-cab"></i> cab <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#calculator"><i class="fa fa-calculator"></i> calculator</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#calendar"><i class="fa fa-calendar"></i> calendar</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#calendar-check-o"><i class="fa fa-calendar-check-o"></i> calendar-check-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#calendar-minus-o"><i class="fa fa-calendar-minus-o"></i> calendar-minus-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#calendar-o"><i class="fa fa-calendar-o"></i> calendar-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#calendar-plus-o"><i class="fa fa-calendar-plus-o"></i> calendar-plus-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#calendar-times-o"><i class="fa fa-calendar-times-o"></i> calendar-times-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#camera"><i class="fa fa-camera"></i> camera</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#camera-retro"><i class="fa fa-camera-retro"></i> camera-retro</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#car"><i class="fa fa-car"></i> car</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-down"><i class="fa fa-caret-square-o-down"></i> caret-square-o-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-left"><i class="fa fa-caret-square-o-left"></i> caret-square-o-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-right"><i class="fa fa-caret-square-o-right"></i> caret-square-o-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-up"><i class="fa fa-caret-square-o-up"></i> caret-square-o-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cart-arrow-down"><i class="fa fa-cart-arrow-down"></i> cart-arrow-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cart-plus"><i class="fa fa-cart-plus"></i> cart-plus</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc"><i class="fa fa-cc"></i> cc</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#certificate"><i class="fa fa-certificate"></i> certificate</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#check"><i class="fa fa-check"></i> check</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#check-circle"><i class="fa fa-check-circle"></i> check-circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#check-circle-o"><i class="fa fa-check-circle-o"></i> check-circle-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#check-square"><i class="fa fa-check-square"></i> check-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#check-square-o"><i class="fa fa-check-square-o"></i> check-square-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#child"><i class="fa fa-child"></i> child</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#circle"><i class="fa fa-circle"></i> circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#circle-o"><i class="fa fa-circle-o"></i> circle-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#circle-o-notch"><i class="fa fa-circle-o-notch"></i> circle-o-notch</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#circle-thin"><i class="fa fa-circle-thin"></i> circle-thin</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#clock-o"><i class="fa fa-clock-o"></i> clock-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#clone"><i class="fa fa-clone"></i> clone</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#times"><i class="fa fa-close"></i> close <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cloud"><i class="fa fa-cloud"></i> cloud</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cloud-download"><i class="fa fa-cloud-download"></i> cloud-download</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cloud-upload"><i class="fa fa-cloud-upload"></i> cloud-upload</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#code"><i class="fa fa-code"></i> code</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#code-fork"><i class="fa fa-code-fork"></i> code-fork</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#coffee"><i class="fa fa-coffee"></i> coffee</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cog"><i class="fa fa-cog"></i> cog</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cogs"><i class="fa fa-cogs"></i> cogs</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#comment"><i class="fa fa-comment"></i> comment</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#comment-o"><i class="fa fa-comment-o"></i> comment-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#commenting"><i class="fa fa-commenting"></i> commenting</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#commenting-o"><i class="fa fa-commenting-o"></i> commenting-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#comments"><i class="fa fa-comments"></i> comments</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#comments-o"><i class="fa fa-comments-o"></i> comments-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#compass"><i class="fa fa-compass"></i> compass</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#copyright"><i class="fa fa-copyright"></i> copyright</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#creative-commons"><i class="fa fa-creative-commons"></i> creative-commons</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#credit-card"><i class="fa fa-credit-card"></i> credit-card</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#crop"><i class="fa fa-crop"></i> crop</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#crosshairs"><i class="fa fa-crosshairs"></i> crosshairs</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cube"><i class="fa fa-cube"></i> cube</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cubes"><i class="fa fa-cubes"></i> cubes</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cutlery"><i class="fa fa-cutlery"></i> cutlery</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tachometer"><i class="fa fa-dashboard"></i> dashboard <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#database"><i class="fa fa-database"></i> database</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#desktop"><i class="fa fa-desktop"></i> desktop</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#diamond"><i class="fa fa-diamond"></i> diamond</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#dot-circle-o"><i class="fa fa-dot-circle-o"></i> dot-circle-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#download"><i class="fa fa-download"></i> download</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pencil-square-o"><i class="fa fa-edit"></i> edit <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#ellipsis-h"><i class="fa fa-ellipsis-h"></i> ellipsis-h</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#ellipsis-v"><i class="fa fa-ellipsis-v"></i> ellipsis-v</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#envelope"><i class="fa fa-envelope"></i> envelope</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#envelope-o"><i class="fa fa-envelope-o"></i> envelope-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#envelope-square"><i class="fa fa-envelope-square"></i> envelope-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#eraser"><i class="fa fa-eraser"></i> eraser</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#exchange"><i class="fa fa-exchange"></i> exchange</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#exclamation"><i class="fa fa-exclamation"></i> exclamation</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#exclamation-circle"><i class="fa fa-exclamation-circle"></i> exclamation-circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#exclamation-triangle"><i class="fa fa-exclamation-triangle"></i> exclamation-triangle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#external-link"><i class="fa fa-external-link"></i> external-link</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#external-link-square"><i class="fa fa-external-link-square"></i> external-link-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#eye"><i class="fa fa-eye"></i> eye</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#eye-slash"><i class="fa fa-eye-slash"></i> eye-slash</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#eyedropper"><i class="fa fa-eyedropper"></i> eyedropper</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#fax"><i class="fa fa-fax"></i> fax</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#rss"><i class="fa fa-feed"></i> feed <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#female"><i class="fa fa-female"></i> female</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#fighter-jet"><i class="fa fa-fighter-jet"></i> fighter-jet</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-archive-o"><i class="fa fa-file-archive-o"></i> file-archive-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-audio-o"><i class="fa fa-file-audio-o"></i> file-audio-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-code-o"><i class="fa fa-file-code-o"></i> file-code-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-excel-o"><i class="fa fa-file-excel-o"></i> file-excel-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-image-o"><i class="fa fa-file-image-o"></i> file-image-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-video-o"><i class="fa fa-file-movie-o"></i> file-movie-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-pdf-o"><i class="fa fa-file-pdf-o"></i> file-pdf-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-image-o"><i class="fa fa-file-photo-o"></i> file-photo-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-image-o"><i class="fa fa-file-picture-o"></i> file-picture-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-powerpoint-o"><i class="fa fa-file-powerpoint-o"></i> file-powerpoint-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-audio-o"><i class="fa fa-file-sound-o"></i> file-sound-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-video-o"><i class="fa fa-file-video-o"></i> file-video-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-word-o"><i class="fa fa-file-word-o"></i> file-word-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-archive-o"><i class="fa fa-file-zip-o"></i> file-zip-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#film"><i class="fa fa-film"></i> film</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#filter"><i class="fa fa-filter"></i> filter</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#fire"><i class="fa fa-fire"></i> fire</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#fire-extinguisher"><i class="fa fa-fire-extinguisher"></i> fire-extinguisher</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#flag"><i class="fa fa-flag"></i> flag</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#flag-checkered"><i class="fa fa-flag-checkered"></i> flag-checkered</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#flag-o"><i class="fa fa-flag-o"></i> flag-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bolt"><i class="fa fa-flash"></i> flash <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#flask"><i class="fa fa-flask"></i> flask</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#folder"><i class="fa fa-folder"></i> folder</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#folder-o"><i class="fa fa-folder-o"></i> folder-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#folder-open"><i class="fa fa-folder-open"></i> folder-open</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#folder-open-o"><i class="fa fa-folder-open-o"></i> folder-open-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#frown-o"><i class="fa fa-frown-o"></i> frown-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#futbol-o"><i class="fa fa-futbol-o"></i> futbol-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gamepad"><i class="fa fa-gamepad"></i> gamepad</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gavel"><i class="fa fa-gavel"></i> gavel</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cog"><i class="fa fa-gear"></i> gear <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cogs"><i class="fa fa-gears"></i> gears <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gift"><i class="fa fa-gift"></i> gift</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#glass"><i class="fa fa-glass"></i> glass</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#globe"><i class="fa fa-globe"></i> globe</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#graduation-cap"><i class="fa fa-graduation-cap"></i> graduation-cap</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#users"><i class="fa fa-group"></i> group <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-rock-o"><i class="fa fa-hand-grab-o"></i> hand-grab-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-lizard-o"><i class="fa fa-hand-lizard-o"></i> hand-lizard-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-paper-o"><i class="fa fa-hand-paper-o"></i> hand-paper-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-peace-o"><i class="fa fa-hand-peace-o"></i> hand-peace-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-pointer-o"><i class="fa fa-hand-pointer-o"></i> hand-pointer-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-rock-o"><i class="fa fa-hand-rock-o"></i> hand-rock-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-scissors-o"><i class="fa fa-hand-scissors-o"></i> hand-scissors-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-spock-o"><i class="fa fa-hand-spock-o"></i> hand-spock-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-paper-o"><i class="fa fa-hand-stop-o"></i> hand-stop-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hdd-o"><i class="fa fa-hdd-o"></i> hdd-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#headphones"><i class="fa fa-headphones"></i> headphones</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#heart"><i class="fa fa-heart"></i> heart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#heart-o"><i class="fa fa-heart-o"></i> heart-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#heartbeat"><i class="fa fa-heartbeat"></i> heartbeat</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#history"><i class="fa fa-history"></i> history</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#home"><i class="fa fa-home"></i> home</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bed"><i class="fa fa-hotel"></i> hotel <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass"><i class="fa fa-hourglass"></i> hourglass</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-start"><i class="fa fa-hourglass-1"></i> hourglass-1 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-half"><i class="fa fa-hourglass-2"></i> hourglass-2 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-end"><i class="fa fa-hourglass-3"></i> hourglass-3 <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-end"><i class="fa fa-hourglass-end"></i> hourglass-end</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-half"><i class="fa fa-hourglass-half"></i> hourglass-half</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-o"><i class="fa fa-hourglass-o"></i> hourglass-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hourglass-start"><i class="fa fa-hourglass-start"></i> hourglass-start</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#i-cursor"><i class="fa fa-i-cursor"></i> i-cursor</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#picture-o"><i class="fa fa-image"></i> image <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#inbox"><i class="fa fa-inbox"></i> inbox</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#industry"><i class="fa fa-industry"></i> industry</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#info"><i class="fa fa-info"></i> info</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#info-circle"><i class="fa fa-info-circle"></i> info-circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#university"><i class="fa fa-institution"></i> institution <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#key"><i class="fa fa-key"></i> key</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#keyboard-o"><i class="fa fa-keyboard-o"></i> keyboard-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#language"><i class="fa fa-language"></i> language</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#laptop"><i class="fa fa-laptop"></i> laptop</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#leaf"><i class="fa fa-leaf"></i> leaf</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gavel"><i class="fa fa-legal"></i> legal <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#lemon-o"><i class="fa fa-lemon-o"></i> lemon-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#level-down"><i class="fa fa-level-down"></i> level-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#level-up"><i class="fa fa-level-up"></i> level-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#life-ring"><i class="fa fa-life-bouy"></i> life-bouy <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#life-ring"><i class="fa fa-life-buoy"></i> life-buoy <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#life-ring"><i class="fa fa-life-ring"></i> life-ring</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#life-ring"><i class="fa fa-life-saver"></i> life-saver <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#lightbulb-o"><i class="fa fa-lightbulb-o"></i> lightbulb-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#line-chart"><i class="fa fa-line-chart"></i> line-chart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#location-arrow"><i class="fa fa-location-arrow"></i> location-arrow</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#lock"><i class="fa fa-lock"></i> lock</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#magic"><i class="fa fa-magic"></i> magic</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#magnet"><i class="fa fa-magnet"></i> magnet</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#share"><i class="fa fa-mail-forward"></i> mail-forward <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#reply"><i class="fa fa-mail-reply"></i> mail-reply <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#reply-all"><i class="fa fa-mail-reply-all"></i> mail-reply-all <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#male"><i class="fa fa-male"></i> male</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#map"><i class="fa fa-map"></i> map</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#map-marker"><i class="fa fa-map-marker"></i> map-marker</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#map-o"><i class="fa fa-map-o"></i> map-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#map-pin"><i class="fa fa-map-pin"></i> map-pin</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#map-signs"><i class="fa fa-map-signs"></i> map-signs</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#meh-o"><i class="fa fa-meh-o"></i> meh-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#microphone"><i class="fa fa-microphone"></i> microphone</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#microphone-slash"><i class="fa fa-microphone-slash"></i> microphone-slash</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#minus"><i class="fa fa-minus"></i> minus</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#minus-circle"><i class="fa fa-minus-circle"></i> minus-circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#minus-square"><i class="fa fa-minus-square"></i> minus-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#minus-square-o"><i class="fa fa-minus-square-o"></i> minus-square-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#mobile"><i class="fa fa-mobile"></i> mobile</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#mobile"><i class="fa fa-mobile-phone"></i> mobile-phone <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#money"><i class="fa fa-money"></i> money</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#moon-o"><i class="fa fa-moon-o"></i> moon-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#graduation-cap"><i class="fa fa-mortar-board"></i> mortar-board <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#motorcycle"><i class="fa fa-motorcycle"></i> motorcycle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#mouse-pointer"><i class="fa fa-mouse-pointer"></i> mouse-pointer</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#music"><i class="fa fa-music"></i> music</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bars"><i class="fa fa-navicon"></i> navicon <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#newspaper-o"><i class="fa fa-newspaper-o"></i> newspaper-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#object-group"><i class="fa fa-object-group"></i> object-group</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#object-ungroup"><i class="fa fa-object-ungroup"></i> object-ungroup</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#paint-brush"><i class="fa fa-paint-brush"></i> paint-brush</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#paper-plane"><i class="fa fa-paper-plane"></i> paper-plane</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#paper-plane-o"><i class="fa fa-paper-plane-o"></i> paper-plane-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#paw"><i class="fa fa-paw"></i> paw</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pencil"><i class="fa fa-pencil"></i> pencil</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pencil-square"><i class="fa fa-pencil-square"></i> pencil-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pencil-square-o"><i class="fa fa-pencil-square-o"></i> pencil-square-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#phone"><i class="fa fa-phone"></i> phone</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#phone-square"><i class="fa fa-phone-square"></i> phone-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#picture-o"><i class="fa fa-photo"></i> photo <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#picture-o"><i class="fa fa-picture-o"></i> picture-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pie-chart"><i class="fa fa-pie-chart"></i> pie-chart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#plane"><i class="fa fa-plane"></i> plane</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#plug"><i class="fa fa-plug"></i> plug</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#plus"><i class="fa fa-plus"></i> plus</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#plus-circle"><i class="fa fa-plus-circle"></i> plus-circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#plus-square"><i class="fa fa-plus-square"></i> plus-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#plus-square-o"><i class="fa fa-plus-square-o"></i> plus-square-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#power-off"><i class="fa fa-power-off"></i> power-off</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#print"><i class="fa fa-print"></i> print</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#puzzle-piece"><i class="fa fa-puzzle-piece"></i> puzzle-piece</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#qrcode"><i class="fa fa-qrcode"></i> qrcode</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#question"><i class="fa fa-question"></i> question</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#question-circle"><i class="fa fa-question-circle"></i> question-circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#quote-left"><i class="fa fa-quote-left"></i> quote-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#quote-right"><i class="fa fa-quote-right"></i> quote-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#random"><i class="fa fa-random"></i> random</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#recycle"><i class="fa fa-recycle"></i> recycle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#refresh"><i class="fa fa-refresh"></i> refresh</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#registered"><i class="fa fa-registered"></i> registered</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#times"><i class="fa fa-remove"></i> remove <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bars"><i class="fa fa-reorder"></i> reorder <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#reply"><i class="fa fa-reply"></i> reply</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#reply-all"><i class="fa fa-reply-all"></i> reply-all</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#retweet"><i class="fa fa-retweet"></i> retweet</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#road"><i class="fa fa-road"></i> road</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#rocket"><i class="fa fa-rocket"></i> rocket</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#rss"><i class="fa fa-rss"></i> rss</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#rss-square"><i class="fa fa-rss-square"></i> rss-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#search"><i class="fa fa-search"></i> search</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#search-minus"><i class="fa fa-search-minus"></i> search-minus</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#search-plus"><i class="fa fa-search-plus"></i> search-plus</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#paper-plane"><i class="fa fa-send"></i> send <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#paper-plane-o"><i class="fa fa-send-o"></i> send-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#server"><i class="fa fa-server"></i> server</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#share"><i class="fa fa-share"></i> share</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#share-alt"><i class="fa fa-share-alt"></i> share-alt</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#share-alt-square"><i class="fa fa-share-alt-square"></i> share-alt-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#share-square"><i class="fa fa-share-square"></i> share-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#share-square-o"><i class="fa fa-share-square-o"></i> share-square-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#shield"><i class="fa fa-shield"></i> shield</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#ship"><i class="fa fa-ship"></i> ship</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#shopping-cart"><i class="fa fa-shopping-cart"></i> shopping-cart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sign-in"><i class="fa fa-sign-in"></i> sign-in</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sign-out"><i class="fa fa-sign-out"></i> sign-out</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#signal"><i class="fa fa-signal"></i> signal</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sitemap"><i class="fa fa-sitemap"></i> sitemap</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sliders"><i class="fa fa-sliders"></i> sliders</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#smile-o"><i class="fa fa-smile-o"></i> smile-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#futbol-o"><i class="fa fa-soccer-ball-o"></i> soccer-ball-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sort"><i class="fa fa-sort"></i> sort</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sort-alpha-asc"><i class="fa fa-sort-alpha-asc"></i> sort-alpha-asc</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sort-alpha-desc"><i class="fa fa-sort-alpha-desc"></i> sort-alpha-desc</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sort-amount-asc"><i class="fa fa-sort-amount-asc"></i> sort-amount-asc</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sort-amount-desc"><i class="fa fa-sort-amount-desc"></i> sort-amount-desc</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sort-asc"><i class="fa fa-sort-asc"></i> sort-asc</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sort-desc"><i class="fa fa-sort-desc"></i> sort-desc</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sort-desc"><i class="fa fa-sort-down"></i> sort-down <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sort-numeric-asc"><i class="fa fa-sort-numeric-asc"></i> sort-numeric-asc</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sort-numeric-desc"><i class="fa fa-sort-numeric-desc"></i> sort-numeric-desc</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sort-asc"><i class="fa fa-sort-up"></i> sort-up <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#space-shuttle"><i class="fa fa-space-shuttle"></i> space-shuttle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#spinner"><i class="fa fa-spinner"></i> spinner</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#spoon"><i class="fa fa-spoon"></i> spoon</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#square"><i class="fa fa-square"></i> square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#square-o"><i class="fa fa-square-o"></i> square-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#star"><i class="fa fa-star"></i> star</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#star-half"><i class="fa fa-star-half"></i> star-half</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#star-half-o"><i class="fa fa-star-half-empty"></i> star-half-empty <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#star-half-o"><i class="fa fa-star-half-full"></i> star-half-full <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#star-half-o"><i class="fa fa-star-half-o"></i> star-half-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#star-o"><i class="fa fa-star-o"></i> star-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sticky-note"><i class="fa fa-sticky-note"></i> sticky-note</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sticky-note-o"><i class="fa fa-sticky-note-o"></i> sticky-note-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#street-view"><i class="fa fa-street-view"></i> street-view</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#suitcase"><i class="fa fa-suitcase"></i> suitcase</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sun-o"><i class="fa fa-sun-o"></i> sun-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#life-ring"><i class="fa fa-support"></i> support <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tablet"><i class="fa fa-tablet"></i> tablet</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tachometer"><i class="fa fa-tachometer"></i> tachometer</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tag"><i class="fa fa-tag"></i> tag</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tags"><i class="fa fa-tags"></i> tags</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tasks"><i class="fa fa-tasks"></i> tasks</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#taxi"><i class="fa fa-taxi"></i> taxi</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#television"><i class="fa fa-television"></i> television</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#terminal"><i class="fa fa-terminal"></i> terminal</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#thumb-tack"><i class="fa fa-thumb-tack"></i> thumb-tack</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#thumbs-down"><i class="fa fa-thumbs-down"></i> thumbs-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#thumbs-o-down"><i class="fa fa-thumbs-o-down"></i> thumbs-o-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#thumbs-o-up"><i class="fa fa-thumbs-o-up"></i> thumbs-o-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#thumbs-up"><i class="fa fa-thumbs-up"></i> thumbs-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#ticket"><i class="fa fa-ticket"></i> ticket</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#times"><i class="fa fa-times"></i> times</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#times-circle"><i class="fa fa-times-circle"></i> times-circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#times-circle-o"><i class="fa fa-times-circle-o"></i> times-circle-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tint"><i class="fa fa-tint"></i> tint</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-down"><i class="fa fa-toggle-down"></i> toggle-down <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-left"><i class="fa fa-toggle-left"></i> toggle-left <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#toggle-off"><i class="fa fa-toggle-off"></i> toggle-off</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#toggle-on"><i class="fa fa-toggle-on"></i> toggle-on</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-right"><i class="fa fa-toggle-right"></i> toggle-right <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-up"><i class="fa fa-toggle-up"></i> toggle-up <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#trademark"><i class="fa fa-trademark"></i> trademark</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#trash"><i class="fa fa-trash"></i> trash</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#trash-o"><i class="fa fa-trash-o"></i> trash-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tree"><i class="fa fa-tree"></i> tree</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#trophy"><i class="fa fa-trophy"></i> trophy</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#truck"><i class="fa fa-truck"></i> truck</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tty"><i class="fa fa-tty"></i> tty</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#television"><i class="fa fa-tv"></i> tv <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#umbrella"><i class="fa fa-umbrella"></i> umbrella</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#university"><i class="fa fa-university"></i> university</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#unlock"><i class="fa fa-unlock"></i> unlock</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#unlock-alt"><i class="fa fa-unlock-alt"></i> unlock-alt</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sort"><i class="fa fa-unsorted"></i> unsorted <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#upload"><i class="fa fa-upload"></i> upload</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#user"><i class="fa fa-user"></i> user</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#user-plus"><i class="fa fa-user-plus"></i> user-plus</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#user-secret"><i class="fa fa-user-secret"></i> user-secret</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#user-times"><i class="fa fa-user-times"></i> user-times</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#users"><i class="fa fa-users"></i> users</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#video-camera"><i class="fa fa-video-camera"></i> video-camera</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#volume-down"><i class="fa fa-volume-down"></i> volume-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#volume-off"><i class="fa fa-volume-off"></i> volume-off</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#volume-up"><i class="fa fa-volume-up"></i> volume-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#exclamation-triangle"><i class="fa fa-warning"></i> warning <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#wheelchair"><i class="fa fa-wheelchair"></i> wheelchair</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#wifi"><i class="fa fa-wifi"></i> wifi</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#wrench"><i class="fa fa-wrench"></i> wrench</a></div>
-
-                            </div>
-
-                        </section>
-                        <section id="hand">
-                            <h2 class="page-header">手型图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-rock-o"><i class="fa fa-hand-grab-o"></i> hand-grab-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-lizard-o"><i class="fa fa-hand-lizard-o"></i> hand-lizard-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-o-down"><i class="fa fa-hand-o-down"></i> hand-o-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-o-left"><i class="fa fa-hand-o-left"></i> hand-o-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-o-right"><i class="fa fa-hand-o-right"></i> hand-o-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-o-up"><i class="fa fa-hand-o-up"></i> hand-o-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-paper-o"><i class="fa fa-hand-paper-o"></i> hand-paper-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-peace-o"><i class="fa fa-hand-peace-o"></i> hand-peace-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-pointer-o"><i class="fa fa-hand-pointer-o"></i> hand-pointer-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-rock-o"><i class="fa fa-hand-rock-o"></i> hand-rock-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-scissors-o"><i class="fa fa-hand-scissors-o"></i> hand-scissors-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-spock-o"><i class="fa fa-hand-spock-o"></i> hand-spock-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-paper-o"><i class="fa fa-hand-stop-o"></i> hand-stop-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#thumbs-down"><i class="fa fa-thumbs-down"></i> thumbs-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#thumbs-o-down"><i class="fa fa-thumbs-o-down"></i> thumbs-o-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#thumbs-o-up"><i class="fa fa-thumbs-o-up"></i> thumbs-o-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#thumbs-up"><i class="fa fa-thumbs-up"></i> thumbs-up</a></div>
-
-                            </div>
-
-                        </section>
-
-                        <section id="transportation">
-                            <h2 class="page-header">交通运输图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#ambulance"><i class="fa fa-ambulance"></i> ambulance</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#car"><i class="fa fa-automobile"></i> automobile <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bicycle"><i class="fa fa-bicycle"></i> bicycle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bus"><i class="fa fa-bus"></i> bus</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#taxi"><i class="fa fa-cab"></i> cab <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#car"><i class="fa fa-car"></i> car</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#fighter-jet"><i class="fa fa-fighter-jet"></i> fighter-jet</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#motorcycle"><i class="fa fa-motorcycle"></i> motorcycle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#plane"><i class="fa fa-plane"></i> plane</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#rocket"><i class="fa fa-rocket"></i> rocket</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#ship"><i class="fa fa-ship"></i> ship</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#space-shuttle"><i class="fa fa-space-shuttle"></i> space-shuttle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#subway"><i class="fa fa-subway"></i> subway</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#taxi"><i class="fa fa-taxi"></i> taxi</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#train"><i class="fa fa-train"></i> train</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#truck"><i class="fa fa-truck"></i> truck</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#wheelchair"><i class="fa fa-wheelchair"></i> wheelchair</a></div>
-
-                            </div>
-
-                        </section>
-                        <section id="gender">
-                            <h2 class="page-header">性别图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#genderless"><i class="fa fa-genderless"></i> genderless</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#transgender"><i class="fa fa-intersex"></i> intersex <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#mars"><i class="fa fa-mars"></i> mars</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#mars-double"><i class="fa fa-mars-double"></i> mars-double</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#mars-stroke"><i class="fa fa-mars-stroke"></i> mars-stroke</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#mars-stroke-h"><i class="fa fa-mars-stroke-h"></i> mars-stroke-h</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#mars-stroke-v"><i class="fa fa-mars-stroke-v"></i> mars-stroke-v</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#mercury"><i class="fa fa-mercury"></i> mercury</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#neuter"><i class="fa fa-neuter"></i> neuter</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#transgender"><i class="fa fa-transgender"></i> transgender</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#transgender-alt"><i class="fa fa-transgender-alt"></i> transgender-alt</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#venus"><i class="fa fa-venus"></i> venus</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#venus-double"><i class="fa fa-venus-double"></i> venus-double</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#venus-mars"><i class="fa fa-venus-mars"></i> venus-mars</a></div>
-
-                            </div>
-
-                        </section>
-                        <section id="file-type">
-                            <h2 class="page-header">文件类型图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file"><i class="fa fa-file"></i> file</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-archive-o"><i class="fa fa-file-archive-o"></i> file-archive-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-audio-o"><i class="fa fa-file-audio-o"></i> file-audio-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-code-o"><i class="fa fa-file-code-o"></i> file-code-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-excel-o"><i class="fa fa-file-excel-o"></i> file-excel-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-image-o"><i class="fa fa-file-image-o"></i> file-image-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-video-o"><i class="fa fa-file-movie-o"></i> file-movie-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-o"><i class="fa fa-file-o"></i> file-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-pdf-o"><i class="fa fa-file-pdf-o"></i> file-pdf-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-image-o"><i class="fa fa-file-photo-o"></i> file-photo-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-image-o"><i class="fa fa-file-picture-o"></i> file-picture-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-powerpoint-o"><i class="fa fa-file-powerpoint-o"></i> file-powerpoint-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-audio-o"><i class="fa fa-file-sound-o"></i> file-sound-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-text"><i class="fa fa-file-text"></i> file-text</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-text-o"><i class="fa fa-file-text-o"></i> file-text-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-video-o"><i class="fa fa-file-video-o"></i> file-video-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-word-o"><i class="fa fa-file-word-o"></i> file-word-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-archive-o"><i class="fa fa-file-zip-o"></i> file-zip-o <span class="text-muted">(alias)</span></a></div>
-
-                            </div>
-
-                        </section>
-                        <section id="spinner">
-                            <h2 class="page-header">加载动画图标</h2>
-
-                            <div class="alert alert-success">
-                                <ul class="fa-ul">
-                                    <li>
-                                        <i class="fa fa-info-circle fa-lg fa-li"></i> 给这些图标加上
-                                        <code>fa-spin</code> class，就可以表现出加载动画了
-                                    </li>
-                                </ul>
-                            </div>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#circle-o-notch"><i class="fa fa-circle-o-notch"></i> circle-o-notch</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cog"><i class="fa fa-cog"></i> cog</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cog"><i class="fa fa-gear"></i> gear <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#refresh"><i class="fa fa-refresh"></i> refresh</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#spinner"><i class="fa fa-spinner"></i> spinner</a></div>
-
-                            </div>
-                        </section>
-                        <section id="form-control">
-                            <h2 class="page-header">表单图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#check-square"><i class="fa fa-check-square"></i> check-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#check-square-o"><i class="fa fa-check-square-o"></i> check-square-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#circle"><i class="fa fa-circle"></i> circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#circle-o"><i class="fa fa-circle-o"></i> circle-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#dot-circle-o"><i class="fa fa-dot-circle-o"></i> dot-circle-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#minus-square"><i class="fa fa-minus-square"></i> minus-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#minus-square-o"><i class="fa fa-minus-square-o"></i> minus-square-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#plus-square"><i class="fa fa-plus-square"></i> plus-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#plus-square-o"><i class="fa fa-plus-square-o"></i> plus-square-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#square"><i class="fa fa-square"></i> square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#square-o"><i class="fa fa-square-o"></i> square-o</a></div>
-
-                            </div>
-                        </section>
-                        <section id="payment">
-                            <h2 class="page-header">支付图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-amex"><i class="fa fa-cc-amex"></i> cc-amex</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-diners-club"><i class="fa fa-cc-diners-club"></i> cc-diners-club</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-discover"><i class="fa fa-cc-discover"></i> cc-discover</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-jcb"><i class="fa fa-cc-jcb"></i> cc-jcb</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-mastercard"><i class="fa fa-cc-mastercard"></i> cc-mastercard</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-paypal"><i class="fa fa-cc-paypal"></i> cc-paypal</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-stripe"><i class="fa fa-cc-stripe"></i> cc-stripe</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-visa"><i class="fa fa-cc-visa"></i> cc-visa</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#credit-card"><i class="fa fa-credit-card"></i> credit-card</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#google-wallet"><i class="fa fa-google-wallet"></i> google-wallet</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#paypal"><i class="fa fa-paypal"></i> paypal</a></div>
-
-                            </div>
-
-                        </section>
-                        <section id="chart">
-                            <h2 class="page-header">统计图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#area-chart"><i class="fa fa-area-chart"></i> area-chart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bar-chart"><i class="fa fa-bar-chart"></i> bar-chart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bar-chart"><i class="fa fa-bar-chart-o"></i> bar-chart-o <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#line-chart"><i class="fa fa-line-chart"></i> line-chart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pie-chart"><i class="fa fa-pie-chart"></i> pie-chart</a></div>
-
-                            </div>
-
-                        </section>
-                        <section id="currency">
-                            <h2 class="page-header">货币图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#btc"><i class="fa fa-bitcoin"></i> bitcoin <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#btc"><i class="fa fa-btc"></i> btc</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#jpy"><i class="fa fa-cny"></i> cny <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#usd"><i class="fa fa-dollar"></i> dollar <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#eur"><i class="fa fa-eur"></i> eur</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#eur"><i class="fa fa-euro"></i> euro <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gbp"><i class="fa fa-gbp"></i> gbp</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gg"><i class="fa fa-gg"></i> gg</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gg-circle"><i class="fa fa-gg-circle"></i> gg-circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#ils"><i class="fa fa-ils"></i> ils</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#inr"><i class="fa fa-inr"></i> inr</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#jpy"><i class="fa fa-jpy"></i> jpy</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#krw"><i class="fa fa-krw"></i> krw</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#money"><i class="fa fa-money"></i> money</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#jpy"><i class="fa fa-rmb"></i> rmb <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#rub"><i class="fa fa-rouble"></i> rouble <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#rub"><i class="fa fa-rub"></i> rub</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#rub"><i class="fa fa-ruble"></i> ruble <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#inr"><i class="fa fa-rupee"></i> rupee <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#ils"><i class="fa fa-shekel"></i> shekel <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#ils"><i class="fa fa-sheqel"></i> sheqel <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#try"><i class="fa fa-try"></i> try</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#try"><i class="fa fa-turkish-lira"></i> turkish-lira <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#usd"><i class="fa fa-usd"></i> usd</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#krw"><i class="fa fa-won"></i> won <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#jpy"><i class="fa fa-yen"></i> yen <span class="text-muted">(alias)</span></a></div>
-
-                            </div>
-
-                        </section>
-                        <section id="text-editor">
-                            <h2 class="page-header">文本编辑器图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#align-center"><i class="fa fa-align-center"></i> align-center</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#align-justify"><i class="fa fa-align-justify"></i> align-justify</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#align-left"><i class="fa fa-align-left"></i> align-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#align-right"><i class="fa fa-align-right"></i> align-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bold"><i class="fa fa-bold"></i> bold</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#link"><i class="fa fa-chain"></i> chain <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#chain-broken"><i class="fa fa-chain-broken"></i> chain-broken</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#clipboard"><i class="fa fa-clipboard"></i> clipboard</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#columns"><i class="fa fa-columns"></i> columns</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#files-o"><i class="fa fa-copy"></i> copy <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#scissors"><i class="fa fa-cut"></i> cut <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#outdent"><i class="fa fa-dedent"></i> dedent <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#eraser"><i class="fa fa-eraser"></i> eraser</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file"><i class="fa fa-file"></i> file</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-o"><i class="fa fa-file-o"></i> file-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-text"><i class="fa fa-file-text"></i> file-text</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#file-text-o"><i class="fa fa-file-text-o"></i> file-text-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#files-o"><i class="fa fa-files-o"></i> files-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#floppy-o"><i class="fa fa-floppy-o"></i> floppy-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#font"><i class="fa fa-font"></i> font</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#header"><i class="fa fa-header"></i> header</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#indent"><i class="fa fa-indent"></i> indent</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#italic"><i class="fa fa-italic"></i> italic</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#link"><i class="fa fa-link"></i> link</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#list"><i class="fa fa-list"></i> list</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#list-alt"><i class="fa fa-list-alt"></i> list-alt</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#list-ol"><i class="fa fa-list-ol"></i> list-ol</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#list-ul"><i class="fa fa-list-ul"></i> list-ul</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#outdent"><i class="fa fa-outdent"></i> outdent</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#paperclip"><i class="fa fa-paperclip"></i> paperclip</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#paragraph"><i class="fa fa-paragraph"></i> paragraph</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#clipboard"><i class="fa fa-paste"></i> paste <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#repeat"><i class="fa fa-repeat"></i> repeat</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#undo"><i class="fa fa-rotate-left"></i> rotate-left <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#repeat"><i class="fa fa-rotate-right"></i> rotate-right <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#floppy-o"><i class="fa fa-save"></i> save <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#scissors"><i class="fa fa-scissors"></i> scissors</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#strikethrough"><i class="fa fa-strikethrough"></i> strikethrough</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#subscript"><i class="fa fa-subscript"></i> subscript</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#superscript"><i class="fa fa-superscript"></i> superscript</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#table"><i class="fa fa-table"></i> table</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#text-height"><i class="fa fa-text-height"></i> text-height</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#text-width"><i class="fa fa-text-width"></i> text-width</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#th"><i class="fa fa-th"></i> th</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#th-large"><i class="fa fa-th-large"></i> th-large</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#th-list"><i class="fa fa-th-list"></i> th-list</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#underline"><i class="fa fa-underline"></i> underline</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#undo"><i class="fa fa-undo"></i> undo</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#chain-broken"><i class="fa fa-unlink"></i> unlink <span class="text-muted">(alias)</span></a></div>
-
-                            </div>
-
-                        </section>
-                        <section id="directional">
-                            <h2 class="page-header">方向图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#angle-double-down"><i class="fa fa-angle-double-down"></i> angle-double-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#angle-double-left"><i class="fa fa-angle-double-left"></i> angle-double-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#angle-double-right"><i class="fa fa-angle-double-right"></i> angle-double-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#angle-double-up"><i class="fa fa-angle-double-up"></i> angle-double-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#angle-down"><i class="fa fa-angle-down"></i> angle-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#angle-left"><i class="fa fa-angle-left"></i> angle-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#angle-right"><i class="fa fa-angle-right"></i> angle-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#angle-up"><i class="fa fa-angle-up"></i> angle-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrow-circle-down"><i class="fa fa-arrow-circle-down"></i> arrow-circle-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrow-circle-left"><i class="fa fa-arrow-circle-left"></i> arrow-circle-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrow-circle-o-down"><i class="fa fa-arrow-circle-o-down"></i> arrow-circle-o-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrow-circle-o-left"><i class="fa fa-arrow-circle-o-left"></i> arrow-circle-o-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrow-circle-o-right"><i class="fa fa-arrow-circle-o-right"></i> arrow-circle-o-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrow-circle-o-up"><i class="fa fa-arrow-circle-o-up"></i> arrow-circle-o-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrow-circle-right"><i class="fa fa-arrow-circle-right"></i> arrow-circle-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrow-circle-up"><i class="fa fa-arrow-circle-up"></i> arrow-circle-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrow-down"><i class="fa fa-arrow-down"></i> arrow-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrow-left"><i class="fa fa-arrow-left"></i> arrow-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrow-right"><i class="fa fa-arrow-right"></i> arrow-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrow-up"><i class="fa fa-arrow-up"></i> arrow-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrows"><i class="fa fa-arrows"></i> arrows</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrows-alt"><i class="fa fa-arrows-alt"></i> arrows-alt</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrows-h"><i class="fa fa-arrows-h"></i> arrows-h</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrows-v"><i class="fa fa-arrows-v"></i> arrows-v</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-down"><i class="fa fa-caret-down"></i> caret-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-left"><i class="fa fa-caret-left"></i> caret-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-right"><i class="fa fa-caret-right"></i> caret-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-down"><i class="fa fa-caret-square-o-down"></i> caret-square-o-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-left"><i class="fa fa-caret-square-o-left"></i> caret-square-o-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-right"><i class="fa fa-caret-square-o-right"></i> caret-square-o-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-up"><i class="fa fa-caret-square-o-up"></i> caret-square-o-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-up"><i class="fa fa-caret-up"></i> caret-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#chevron-circle-down"><i class="fa fa-chevron-circle-down"></i> chevron-circle-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#chevron-circle-left"><i class="fa fa-chevron-circle-left"></i> chevron-circle-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#chevron-circle-right"><i class="fa fa-chevron-circle-right"></i> chevron-circle-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#chevron-circle-up"><i class="fa fa-chevron-circle-up"></i> chevron-circle-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#chevron-down"><i class="fa fa-chevron-down"></i> chevron-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#chevron-left"><i class="fa fa-chevron-left"></i> chevron-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#chevron-right"><i class="fa fa-chevron-right"></i> chevron-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#chevron-up"><i class="fa fa-chevron-up"></i> chevron-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#exchange"><i class="fa fa-exchange"></i> exchange</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-o-down"><i class="fa fa-hand-o-down"></i> hand-o-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-o-left"><i class="fa fa-hand-o-left"></i> hand-o-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-o-right"><i class="fa fa-hand-o-right"></i> hand-o-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hand-o-up"><i class="fa fa-hand-o-up"></i> hand-o-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#long-arrow-down"><i class="fa fa-long-arrow-down"></i> long-arrow-down</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#long-arrow-left"><i class="fa fa-long-arrow-left"></i> long-arrow-left</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#long-arrow-right"><i class="fa fa-long-arrow-right"></i> long-arrow-right</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#long-arrow-up"><i class="fa fa-long-arrow-up"></i> long-arrow-up</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-down"><i class="fa fa-toggle-down"></i> toggle-down <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-left"><i class="fa fa-toggle-left"></i> toggle-left <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-right"><i class="fa fa-toggle-right"></i> toggle-right <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#caret-square-o-up"><i class="fa fa-toggle-up"></i> toggle-up <span class="text-muted">(alias)</span></a></div>
-
-                            </div>
-
-                        </section>
-                        <section id="video-player">
-                            <h2 class="page-header">视频播放图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#arrows-alt"><i class="fa fa-arrows-alt"></i> arrows-alt</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#backward"><i class="fa fa-backward"></i> backward</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#compress"><i class="fa fa-compress"></i> compress</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#eject"><i class="fa fa-eject"></i> eject</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#expand"><i class="fa fa-expand"></i> expand</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#fast-backward"><i class="fa fa-fast-backward"></i> fast-backward</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#fast-forward"><i class="fa fa-fast-forward"></i> fast-forward</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#forward"><i class="fa fa-forward"></i> forward</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pause"><i class="fa fa-pause"></i> pause</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#play"><i class="fa fa-play"></i> play</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#play-circle"><i class="fa fa-play-circle"></i> play-circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#play-circle-o"><i class="fa fa-play-circle-o"></i> play-circle-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#random"><i class="fa fa-random"></i> random</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#step-backward"><i class="fa fa-step-backward"></i> step-backward</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#step-forward"><i class="fa fa-step-forward"></i> step-forward</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#stop"><i class="fa fa-stop"></i> stop</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#youtube-play"><i class="fa fa-youtube-play"></i> youtube-play</a></div>
-
-                            </div>
-
-                        </section>
-                        <section id="brand">
-                            <h2 class="page-header">品牌图标</h2>
-
-                            <div class="row fontawesome-icon-list margin-bottom-lg">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#500px"><i class="fa fa-500px"></i> 500px</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#adn"><i class="fa fa-adn"></i> adn</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#amazon"><i class="fa fa-amazon"></i> amazon</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#android"><i class="fa fa-android"></i> android</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#angellist"><i class="fa fa-angellist"></i> angellist</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#apple"><i class="fa fa-apple"></i> apple</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#behance"><i class="fa fa-behance"></i> behance</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#behance-square"><i class="fa fa-behance-square"></i> behance-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bitbucket"><i class="fa fa-bitbucket"></i> bitbucket</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#bitbucket-square"><i class="fa fa-bitbucket-square"></i> bitbucket-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#btc"><i class="fa fa-bitcoin"></i> bitcoin <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#black-tie"><i class="fa fa-black-tie"></i> black-tie</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#btc"><i class="fa fa-btc"></i> btc</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#buysellads"><i class="fa fa-buysellads"></i> buysellads</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-amex"><i class="fa fa-cc-amex"></i> cc-amex</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-diners-club"><i class="fa fa-cc-diners-club"></i> cc-diners-club</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-discover"><i class="fa fa-cc-discover"></i> cc-discover</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-jcb"><i class="fa fa-cc-jcb"></i> cc-jcb</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-mastercard"><i class="fa fa-cc-mastercard"></i> cc-mastercard</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-paypal"><i class="fa fa-cc-paypal"></i> cc-paypal</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-stripe"><i class="fa fa-cc-stripe"></i> cc-stripe</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#cc-visa"><i class="fa fa-cc-visa"></i> cc-visa</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#chrome"><i class="fa fa-chrome"></i> chrome</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#codepen"><i class="fa fa-codepen"></i> codepen</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#connectdevelop"><i class="fa fa-connectdevelop"></i> connectdevelop</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#contao"><i class="fa fa-contao"></i> contao</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#css3"><i class="fa fa-css3"></i> css3</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#dashcube"><i class="fa fa-dashcube"></i> dashcube</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#delicious"><i class="fa fa-delicious"></i> delicious</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#deviantart"><i class="fa fa-deviantart"></i> deviantart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#digg"><i class="fa fa-digg"></i> digg</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#dribbble"><i class="fa fa-dribbble"></i> dribbble</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#dropbox"><i class="fa fa-dropbox"></i> dropbox</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#drupal"><i class="fa fa-drupal"></i> drupal</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#empire"><i class="fa fa-empire"></i> empire</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#expeditedssl"><i class="fa fa-expeditedssl"></i> expeditedssl</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#facebook"><i class="fa fa-facebook"></i> facebook</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#facebook"><i class="fa fa-facebook-f"></i> facebook-f <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#facebook-official"><i class="fa fa-facebook-official"></i> facebook-official</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#facebook-square"><i class="fa fa-facebook-square"></i> facebook-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#firefox"><i class="fa fa-firefox"></i> firefox</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#flickr"><i class="fa fa-flickr"></i> flickr</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#fonticons"><i class="fa fa-fonticons"></i> fonticons</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#forumbee"><i class="fa fa-forumbee"></i> forumbee</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#foursquare"><i class="fa fa-foursquare"></i> foursquare</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#empire"><i class="fa fa-ge"></i> ge <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#get-pocket"><i class="fa fa-get-pocket"></i> get-pocket</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gg"><i class="fa fa-gg"></i> gg</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gg-circle"><i class="fa fa-gg-circle"></i> gg-circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#git"><i class="fa fa-git"></i> git</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#git-square"><i class="fa fa-git-square"></i> git-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#github"><i class="fa fa-github"></i> github</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#github-alt"><i class="fa fa-github-alt"></i> github-alt</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#github-square"><i class="fa fa-github-square"></i> github-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gratipay"><i class="fa fa-gittip"></i> gittip <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#google"><i class="fa fa-google"></i> google</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#google-plus"><i class="fa fa-google-plus"></i> google-plus</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#google-plus-square"><i class="fa fa-google-plus-square"></i> google-plus-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#google-wallet"><i class="fa fa-google-wallet"></i> google-wallet</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#gratipay"><i class="fa fa-gratipay"></i> gratipay</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hacker-news"><i class="fa fa-hacker-news"></i> hacker-news</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#houzz"><i class="fa fa-houzz"></i> houzz</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#html5"><i class="fa fa-html5"></i> html5</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#instagram"><i class="fa fa-instagram"></i> instagram</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#internet-explorer"><i class="fa fa-internet-explorer"></i> internet-explorer</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#ioxhost"><i class="fa fa-ioxhost"></i> ioxhost</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#joomla"><i class="fa fa-joomla"></i> joomla</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#jsfiddle"><i class="fa fa-jsfiddle"></i> jsfiddle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#lastfm"><i class="fa fa-lastfm"></i> lastfm</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#lastfm-square"><i class="fa fa-lastfm-square"></i> lastfm-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#leanpub"><i class="fa fa-leanpub"></i> leanpub</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#linkedin"><i class="fa fa-linkedin"></i> linkedin</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#linkedin-square"><i class="fa fa-linkedin-square"></i> linkedin-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#linux"><i class="fa fa-linux"></i> linux</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#maxcdn"><i class="fa fa-maxcdn"></i> maxcdn</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#meanpath"><i class="fa fa-meanpath"></i> meanpath</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#medium"><i class="fa fa-medium"></i> medium</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#odnoklassniki"><i class="fa fa-odnoklassniki"></i> odnoklassniki</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#odnoklassniki-square"><i class="fa fa-odnoklassniki-square"></i> odnoklassniki-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#opencart"><i class="fa fa-opencart"></i> opencart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#openid"><i class="fa fa-openid"></i> openid</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#opera"><i class="fa fa-opera"></i> opera</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#optin-monster"><i class="fa fa-optin-monster"></i> optin-monster</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pagelines"><i class="fa fa-pagelines"></i> pagelines</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#paypal"><i class="fa fa-paypal"></i> paypal</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pied-piper"><i class="fa fa-pied-piper"></i> pied-piper</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pied-piper-alt"><i class="fa fa-pied-piper-alt"></i> pied-piper-alt</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pinterest"><i class="fa fa-pinterest"></i> pinterest</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pinterest-p"><i class="fa fa-pinterest-p"></i> pinterest-p</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#pinterest-square"><i class="fa fa-pinterest-square"></i> pinterest-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#qq"><i class="fa fa-qq"></i> qq</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#rebel"><i class="fa fa-ra"></i> ra <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#rebel"><i class="fa fa-rebel"></i> rebel</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#reddit"><i class="fa fa-reddit"></i> reddit</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#reddit-square"><i class="fa fa-reddit-square"></i> reddit-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#renren"><i class="fa fa-renren"></i> renren</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#safari"><i class="fa fa-safari"></i> safari</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#sellsy"><i class="fa fa-sellsy"></i> sellsy</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#share-alt"><i class="fa fa-share-alt"></i> share-alt</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#share-alt-square"><i class="fa fa-share-alt-square"></i> share-alt-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#shirtsinbulk"><i class="fa fa-shirtsinbulk"></i> shirtsinbulk</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#simplybuilt"><i class="fa fa-simplybuilt"></i> simplybuilt</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#skyatlas"><i class="fa fa-skyatlas"></i> skyatlas</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#skype"><i class="fa fa-skype"></i> skype</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#slack"><i class="fa fa-slack"></i> slack</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#slideshare"><i class="fa fa-slideshare"></i> slideshare</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#soundcloud"><i class="fa fa-soundcloud"></i> soundcloud</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#spotify"><i class="fa fa-spotify"></i> spotify</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#stack-exchange"><i class="fa fa-stack-exchange"></i> stack-exchange</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#stack-overflow"><i class="fa fa-stack-overflow"></i> stack-overflow</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#steam"><i class="fa fa-steam"></i> steam</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#steam-square"><i class="fa fa-steam-square"></i> steam-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#stumbleupon"><i class="fa fa-stumbleupon"></i> stumbleupon</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#stumbleupon-circle"><i class="fa fa-stumbleupon-circle"></i> stumbleupon-circle</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tencent-weibo"><i class="fa fa-tencent-weibo"></i> tencent-weibo</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#trello"><i class="fa fa-trello"></i> trello</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tripadvisor"><i class="fa fa-tripadvisor"></i> tripadvisor</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tumblr"><i class="fa fa-tumblr"></i> tumblr</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#tumblr-square"><i class="fa fa-tumblr-square"></i> tumblr-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#twitch"><i class="fa fa-twitch"></i> twitch</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#twitter"><i class="fa fa-twitter"></i> twitter</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#twitter-square"><i class="fa fa-twitter-square"></i> twitter-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#viacoin"><i class="fa fa-viacoin"></i> viacoin</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#vimeo"><i class="fa fa-vimeo"></i> vimeo</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#vimeo-square"><i class="fa fa-vimeo-square"></i> vimeo-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#vine"><i class="fa fa-vine"></i> vine</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#vk"><i class="fa fa-vk"></i> vk</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#weixin"><i class="fa fa-wechat"></i> wechat <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#weibo"><i class="fa fa-weibo"></i> weibo</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#weixin"><i class="fa fa-weixin"></i> weixin</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#whatsapp"><i class="fa fa-whatsapp"></i> whatsapp</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#wikipedia-w"><i class="fa fa-wikipedia-w"></i> wikipedia-w</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#windows"><i class="fa fa-windows"></i> windows</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#wordpress"><i class="fa fa-wordpress"></i> wordpress</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#xing"><i class="fa fa-xing"></i> xing</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#xing-square"><i class="fa fa-xing-square"></i> xing-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#y-combinator"><i class="fa fa-y-combinator"></i> y-combinator</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hacker-news"><i class="fa fa-y-combinator-square"></i> y-combinator-square <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#yahoo"><i class="fa fa-yahoo"></i> yahoo</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#y-combinator"><i class="fa fa-yc"></i> yc <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hacker-news"><i class="fa fa-yc-square"></i> yc-square <span class="text-muted">(alias)</span></a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#yelp"><i class="fa fa-yelp"></i> yelp</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#youtube"><i class="fa fa-youtube"></i> youtube</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#youtube-play"><i class="fa fa-youtube-play"></i> youtube-play</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#youtube-square"><i class="fa fa-youtube-square"></i> youtube-square</a></div>
-
-                            </div>
-
-                            <div class="alert alert-success">
-                                <ul class="margin-bottom-none padding-left-lg">
-                                    <li>所有品牌图标均为其各自所有者的商标</li>
-                                    <li>使用这些商标并不表示该商标持有人的认可，反之亦然</li>
-                                </ul>
-
-                            </div>
-                        </section>
-                        <section id="medical">
-                            <h2 class="page-header">医疗图标</h2>
-
-                            <div class="row fontawesome-icon-list">
-
-
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#ambulance"><i class="fa fa-ambulance"></i> ambulance</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#h-square"><i class="fa fa-h-square"></i> h-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#heart"><i class="fa fa-heart"></i> heart</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#heart-o"><i class="fa fa-heart-o"></i> heart-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#heartbeat"><i class="fa fa-heartbeat"></i> heartbeat</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#hospital-o"><i class="fa fa-hospital-o"></i> hospital-o</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#medkit"><i class="fa fa-medkit"></i> medkit</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#plus-square"><i class="fa fa-plus-square"></i> plus-square</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#stethoscope"><i class="fa fa-stethoscope"></i> stethoscope</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#user-md"><i class="fa fa-user-md"></i> user-md</a></div>
-
-                                <div class="fa-hover col-md-3 col-sm-4"><a href="#wheelchair"><i class="fa fa-wheelchair"></i> wheelchair</a></div>
-
-                            </div>
-
-                        </section>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/icon/glyphicons.html b/ruoyi-admin/src/main/resources/templates/demo/icon/glyphicons.html
deleted file mode 100644
index aaf71d467..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/icon/glyphicons.html
+++ /dev/null
@@ -1,1364 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('glyphicons图标')" />
-</head>
-<body class="gray-bg">
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-3">
-                <div class="float-e-margins">
-                    <h2>Glyphicons 字体图标</h2> 包括250多个来自 Glyphicon Halflings 的字体图标。Glyphicons Halflings 一般是收费的，但是他们的作者允许 Bootstrap 免费使用。为了表示感谢，希望你在使用时尽量为 Glyphicons 添加一个友情链接。
-                </div>
-            </div>
-            <div class="col-sm-9">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>所有图标 <small class="m-l-sm">所有图标集合 - <a href="http://glyphicons.com/" target="_blank">Glyphicons</a> </small></h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="icons.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="icons.html#">选项1</a>
-                                </li>
-                                <li><a href="icons.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content icons-box">
-                        <div class="bs-glyphicons">
-                            <ul class="bs-glyphicons-list">
-
-                                <li>
-                                    <span class="glyphicon glyphicon-asterisk" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-asterisk</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-plus</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-euro" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-euro</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-eur" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-eur</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-minus" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-minus</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-cloud" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-cloud</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-envelope" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-envelope</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-pencil</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-glass" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-glass</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-music" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-music</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-search</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-heart" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-heart</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-star" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-star</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-star-empty" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-star-empty</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-user</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-film" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-film</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-th-large" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-th-large</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-th" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-th</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-th-list" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-th-list</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-ok</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-remove</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-zoom-in" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-zoom-in</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-zoom-out" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-zoom-out</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-off" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-off</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-signal" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-signal</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-cog" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-cog</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-trash</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-home" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-home</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-file</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-time" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-time</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-road" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-road</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-download-alt</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-download" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-download</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-upload" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-upload</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-inbox" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-inbox</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-play-circle" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-play-circle</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-repeat" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-repeat</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-refresh</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-list-alt</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-lock</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-flag" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-flag</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-headphones" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-headphones</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-volume-off" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-volume-off</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-volume-down" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-volume-down</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-volume-up" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-volume-up</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-qrcode" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-qrcode</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-barcode" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-barcode</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-tag" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-tag</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-tags" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-tags</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-book" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-book</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-bookmark" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-bookmark</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-print" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-print</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-camera" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-camera</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-font" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-font</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-bold" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-bold</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-italic" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-italic</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-text-height" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-text-height</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-text-width" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-text-width</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-align-left" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-align-left</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-align-center" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-align-center</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-align-right" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-align-right</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-align-justify" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-align-justify</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-list" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-list</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-indent-left" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-indent-left</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-indent-right" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-indent-right</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-facetime-video" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-facetime-video</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-picture" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-picture</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-map-marker" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-map-marker</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-adjust" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-adjust</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-tint" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-tint</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-edit</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-share" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-share</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-check" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-check</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-move" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-move</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-step-backward" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-step-backward</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-fast-backward" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-fast-backward</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-backward" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-backward</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-play" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-play</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-pause" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-pause</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-stop" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-stop</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-forward" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-forward</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-fast-forward" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-fast-forward</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-step-forward" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-step-forward</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-eject" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-eject</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-chevron-left</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-chevron-right</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-plus-sign</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-minus-sign" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-minus-sign</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-remove-sign</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-ok-sign</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-question-sign</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-info-sign</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-screenshot" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-screenshot</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-remove-circle" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-remove-circle</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-ok-circle" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-ok-circle</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-ban-circle" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-ban-circle</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-arrow-left</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-arrow-right</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-arrow-up</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-arrow-down" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-arrow-down</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-share-alt</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-resize-full</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-resize-small</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-exclamation-sign</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-gift" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-gift</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-leaf" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-leaf</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-fire" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-fire</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-eye-open</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-eye-close</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-warning-sign</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-plane" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-plane</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-calendar" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-calendar</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-random" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-random</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-comment" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-comment</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-magnet" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-magnet</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-chevron-up" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-chevron-up</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-chevron-down" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-chevron-down</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-retweet" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-retweet</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-shopping-cart</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-folder-close" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-folder-close</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-folder-open</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-resize-vertical" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-resize-vertical</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-resize-horizontal" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-resize-horizontal</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-hdd" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-hdd</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-bullhorn" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-bullhorn</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-bell" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-bell</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-certificate" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-certificate</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-thumbs-up" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-thumbs-up</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-thumbs-down" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-thumbs-down</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-hand-right" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-hand-right</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-hand-left" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-hand-left</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-hand-up" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-hand-up</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-hand-down" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-hand-down</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-circle-arrow-right" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-circle-arrow-right</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-circle-arrow-left" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-circle-arrow-left</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-circle-arrow-up" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-circle-arrow-up</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-circle-arrow-down" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-circle-arrow-down</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-globe" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-globe</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-wrench" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-wrench</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-tasks" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-tasks</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-filter" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-filter</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-briefcase" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-briefcase</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-fullscreen" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-fullscreen</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-dashboard" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-dashboard</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-paperclip</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-heart-empty" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-heart-empty</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-link" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-link</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-phone" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-phone</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-pushpin" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-pushpin</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-usd" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-usd</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-gbp" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-gbp</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sort" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sort</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sort-by-alphabet" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sort-by-alphabet</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sort-by-alphabet-alt" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sort-by-alphabet-alt</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sort-by-order" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sort-by-order</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sort-by-order-alt" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sort-by-order-alt</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sort-by-attributes" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sort-by-attributes</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sort-by-attributes-alt" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sort-by-attributes-alt</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-unchecked" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-unchecked</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-expand" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-expand</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-collapse-down" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-collapse-down</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-collapse-up" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-collapse-up</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-log-in" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-log-in</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-flash" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-flash</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-log-out</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-new-window" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-new-window</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-record" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-record</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-save" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-save</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-open" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-open</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-saved" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-saved</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-import" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-import</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-export" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-export</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-send" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-send</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-floppy-disk</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-floppy-saved" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-floppy-saved</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-floppy-remove" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-floppy-remove</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-floppy-save" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-floppy-save</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-floppy-open" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-floppy-open</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-credit-card" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-credit-card</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-transfer" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-transfer</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-cutlery" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-cutlery</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-header" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-header</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-compressed" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-compressed</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-earphone" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-earphone</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-phone-alt" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-phone-alt</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-tower" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-tower</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-stats" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-stats</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sd-video" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sd-video</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-hd-video" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-hd-video</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-subtitles" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-subtitles</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sound-stereo" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sound-stereo</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sound-dolby" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sound-dolby</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sound-5-1" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sound-5-1</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sound-6-1" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sound-6-1</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sound-7-1" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sound-7-1</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-copyright-mark" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-copyright-mark</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-registration-mark" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-registration-mark</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-cloud-download</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-cloud-upload" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-cloud-upload</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-tree-conifer" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-tree-conifer</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-tree-deciduous" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-tree-deciduous</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-cd" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-cd</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-save-file" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-save-file</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-open-file" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-open-file</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-level-up" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-level-up</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-copy" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-copy</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-paste" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-paste</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-alert" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-alert</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-equalizer" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-equalizer</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-king" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-king</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-queen" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-queen</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-pawn" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-pawn</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-bishop" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-bishop</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-knight" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-knight</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-baby-formula" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-baby-formula</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-tent" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-tent</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-blackboard" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-blackboard</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-bed" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-bed</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-apple" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-apple</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-erase" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-erase</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-hourglass" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-hourglass</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-lamp" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-lamp</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-duplicate" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-duplicate</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-piggy-bank" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-piggy-bank</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-scissors" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-scissors</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-bitcoin" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-bitcoin</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-btc" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-btc</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-xbt" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-xbt</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-yen" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-yen</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-jpy" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-jpy</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-ruble" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-ruble</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-rub" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-rub</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-scale" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-scale</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-ice-lolly" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-ice-lolly</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-ice-lolly-tasted" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-ice-lolly-tasted</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-education" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-education</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-option-horizontal</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-option-vertical" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-option-vertical</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-menu-hamburger</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-modal-window" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-modal-window</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-oil" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-oil</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-grain" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-grain</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-sunglasses" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-sunglasses</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-text-size" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-text-size</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-text-color" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-text-color</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-text-background" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-text-background</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-object-align-top" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-object-align-top</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-object-align-bottom" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-object-align-bottom</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-object-align-horizontal" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-object-align-horizontal</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-object-align-left" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-object-align-left</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-object-align-vertical" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-object-align-vertical</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-object-align-right" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-object-align-right</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-triangle-right" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-triangle-right</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-triangle-left" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-triangle-left</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-triangle-bottom</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-triangle-top" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-triangle-top</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-console" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-console</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-superscript" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-superscript</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-subscript" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-subscript</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-menu-left" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-menu-left</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-menu-right" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-menu-right</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-menu-down" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-menu-down</span>
-                                </li>
-
-                                <li>
-                                    <span class="glyphicon glyphicon-menu-up" aria-hidden="true"></span>
-                                    <span class="glyphicon-class">glyphicon glyphicon-menu-up</span>
-                                </li>
-
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/dialog.html b/ruoyi-admin/src/main/resources/templates/demo/modal/dialog.html
deleted file mode 100644
index 58ffc2db8..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/modal/dialog.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('模态窗口')" />
-</head>
-<body class="gray-bg">
-<div class="wrapper wrapper-content fadeInRight">
-    <div class="row">
-        <div class="col-sm-4">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>模态窗口</h5>
-
-                </div>
-                <div class="ibox-content">
-                    <p>创建自定义的RuoYi模态窗口可通过添加<code>.inmodal</code>类来实现。 </p>
-                    <div class="text-center">
-                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">打开示例窗口</button>
-                    </div>
-                    <div class="modal inmodal" id="myModal" tabindex="-1" role="dialog" aria-hidden="true">
-                        <div class="modal-dialog">
-                            <div class="modal-content animated bounceInRight">
-                                <div class="modal-header">
-                                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span>
-                                    </button>
-                                    <i class="fa fa-laptop modal-icon"></i>
-                                    <h4 class="modal-title">窗口标题</h4>
-                                    <small class="font-bold">这里可以显示副标题。
-                                </div>
-                                <div class="modal-body">
-                                    <p><strong>RuoYi</strong>是一个完全响应式，基于Bootstrap3.3.6最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的jQuery插件，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。</p>
-                                    <div class="form-group">
-                                        <label>Email</label>
-                                        <input type="email" placeholder="请输入您的Email" class="form-control">
-                                    </div>
-                                </div>
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
-                                    <button type="button" class="btn btn-primary">保存</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </div>
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5>大小设置</h5>
-
-                </div>
-                <div class="ibox-content">
-                    <p>模态窗口提供两种大小尺寸，可以通过为模态窗口的<code>.modal-dialog</code>添加类来实现 </p>
-
-                    <div class="text-center">
-                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal5">大模态窗口</button>
-                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal6">小模态窗口</button>
-                    </div>
-                    <div class="modal inmodal fade" id="myModal5" tabindex="-1" role="dialog" aria-hidden="true">
-                        <div class="modal-dialog modal-lg">
-                            <div class="modal-content">
-                                <div class="modal-header">
-                                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-                                    </button>
-                                    <h4 class="modal-title">窗口标题</h4>
-                                    <small class="font-bold">这里可以显示副标题。
-                                </div>
-                                <div class="modal-body">
-                                    <p><strong>RuoYi</strong>是一个完全响应式，基于Bootstrap3.3.6最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的jQuery插件，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。</p>
-                                </div>
-
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
-                                    <button type="button" class="btn btn-primary">保存</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal inmodal fade" id="myModal6" tabindex="-1" role="dialog" aria-hidden="true">
-                        <div class="modal-dialog modal-sm">
-                            <div class="modal-content">
-                                <div class="modal-header">
-                                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-                                    </button>
-                                    <h4 class="modal-title">窗口标题</h4>
-                                </div>
-                                <div class="modal-body">
-                                    <p><strong>RuoYi</strong>是一个完全响应式，基于Bootstrap3.3.6最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的jQuery插件，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。</p>
-                                </div>
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
-                                    <button type="button" class="btn btn-primary">保存</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </div>
-        </div>
-        <div class="col-sm-8">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>动画窗口</h5>
-
-                </div>
-                <div class="ibox-content">
-                    <p>您可以通过为模态窗口的<code>.modal-content</code>添加类来实现动画效果 </p>
-
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal2">沿X轴转动</button>
-                    <div class="modal inmodal" id="myModal2" tabindex="-1" role="dialog" aria-hidden="true">
-                        <div class="modal-dialog">
-                            <div class="modal-content animated flipInY">
-                                <div class="modal-header">
-                                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-                                    </button>
-                                    <h4 class="modal-title">窗口标题</h4>
-                                    <small class="font-bold">这里可以显示副标题。
-                                </div>
-                                <div class="modal-body">
-                                    <p><strong>RuoYi</strong>是一个完全响应式，基于Bootstrap3.3.6最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的jQuery插件，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。</p>
-                                </div>
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
-                                    <button type="button" class="btn btn-primary">保存</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal4">基本动画</button>
-                    <div class="modal inmodal" id="myModal4" tabindex="-1" role="dialog" aria-hidden="true">
-                        <div class="modal-dialog">
-                            <div class="modal-content animated fadeIn">
-                                <div class="modal-header">
-                                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-                                    </button>
-                                    <i class="fa fa-clock-o modal-icon"></i>
-                                    <h4 class="modal-title">窗口标题</h4>
-                                    <small>这里可以显示副标题。
-                                </div>
-                                <div class="modal-body">
-                                    <p><strong>RuoYi</strong>是一个完全响应式，基于Bootstrap3.3.6最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的jQuery插件，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。</p>
-                                </div>
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
-                                    <button type="button" class="btn btn-primary">保存</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </div>
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>设置选项</h5>
-
-                </div>
-                <div class="ibox-content">
-                    <p>可以通过数据绑定或者Javascript来实现模态窗口的相关功能，如果使用数据绑定，可以为元素添加<code>data-</code>，如<code>data-backdrop=""</code>。</p>
-
-                    <div class="table-responsive">
-                        <table class="table table-bordered table-striped">
-                            <thead>
-                            <tr>
-                                <th style="width: 100px;">名称</th>
-                                <th style="width: 50px;">类型</th>
-                                <th style="width: 50px;">默认值</th>
-                                <th>说明</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <tr>
-                                <td>backdrop</td>
-                                <td>boolean 或 string <code>'static'</code></td>
-                                <td>true</td>
-                                <td>遮罩层，或使用<code>'static'</code>指定遮罩层与关闭模态窗口不关联</td>
-                            </tr>
-                            <tr>
-                                <td>keyboard</td>
-                                <td>boolean</td>
-                                <td>true</td>
-                                <td>按Esc键时退出模态窗口</td>
-                            </tr>
-                            <tr>
-                                <td>show</td>
-                                <td>boolean</td>
-                                <td>true</td>
-                                <td>初始化完成后显示模态窗口</td>
-                            </tr>
-                            <tr>
-                                <td>remote</td>
-                                <td>path</td>
-                                <td>false</td>
-                                <td>
-                                    <p><strong class="text-danger">推荐使用数据绑定方式，或使用
-                                        <a href="http://api.jquery.com/load/">jQuery.load</a></p>
-                                    <p>远程URL示例：</p>
-                                    <div class="highlight">
-                                        <pre><code class="language-html" data-lang="html"><span class="nt">&lt;a</span> <span class="na">data-toggle=</span><span class="s">"modal"</span> <span class="na">href=</span><span class="s">"remote.html"</span> <span class="na">data-target=</span><span class="s">"#modal"</span><span class="nt">&gt;</span>Click me<span class="nt">&lt;/a&gt;</span></code></pre>
-                                    </div>
-                                </td>
-                            </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-    <th:block th:include="include :: footer" />
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/form.html b/ruoyi-admin/src/main/resources/templates/demo/modal/form.html
deleted file mode 100644
index ae0ab6ac5..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/modal/form.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-	<th:block th:include="include :: header('新增用户')" />
-</head>
-<body>
-    <div class="form-content">
-        <form id="form-user-add" class="form-horizontal">
-            <div class="row">
-            	<div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>用户名称：</label>
-                        <div class="col-sm-8">
-                            <input name="userName" placeholder="请输入用户名称" class="form-control" type="text">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>归属部门：</label>
-                        <div class="col-sm-8">
-                            <div class="input-group">
-                            	<input name="deptName" type="text" placeholder="请选择归属部门" class="form-control">
-                                <span class="input-group-addon"><i class="fa fa-search"></i></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>手机号码：</label>
-                        <div class="col-sm-8">
-                            <input name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>邮箱：</label>
-                        <div class="col-sm-8">
-                            <input name="email" class="form-control" type="text" placeholder="请输入邮箱">
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>登录账号：</label>
-                        <div class="col-sm-8">
-                            <input name="loginName" placeholder="请输入登录账号" class="form-control" type="text">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>登录密码：</label>
-                        <div class="col-sm-8">
-                            <input name="password" placeholder="请输入登录密码" class="form-control" type="password">
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">用户性别：</label>
-                        <div class="col-sm-8">
-                            <div class="input-group" style="width: 100%">
-                                <select name="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
-				                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-				                </select>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">用户状态：</label>
-                        <div class="col-sm-8">
-                            <label class="toggle-switch switch-solid">
-	                            <input type="checkbox" id="status" checked>
-	                            <span></span>
-	                        </label>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </div>
-	<th:block th:include="include :: footer" />
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/layer.html b/ruoyi-admin/src/main/resources/templates/demo/modal/layer.html
deleted file mode 100644
index 6fd5bae88..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/modal/layer.html
+++ /dev/null
@@ -1,245 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('弹层组件')" />
-</head>
-<body class="gray-bg">
-	<div class="wrapper wrapper-content fadeInRight">
-	    <div class="row">
-	        <div class="col-sm-6">
-	            <div class="ibox">
-	                <div class="ibox-title">
-	                <h5>信息框</h5>
-	                </div>
-	                <div class="ibox-content" id="test">
-	                    <p>通过调用<code>$.modal.alert()</code>实现。 </p>
-	                    <button type="button" class="btn btn-primary" onclick="$.modal.alert('Hi，你好！')">普通</button>
-	                    <button type="button" class="btn btn-success" onclick="$.modal.alertSuccess('Hi，你好！')">成功</button>
-	                    <button type="button" class="btn btn-warning" onclick="$.modal.alertWarning('Hi，你好！')">警告</button>
-	                    <button type="button" class="btn btn-danger" onclick="$.modal.alertError('Hi，你好！')">失败</button>
-	                </div>
-	            </div>
-	        </div>
-	        
-	        <div class="col-sm-6">
-	            <div class="ibox">
-	                <div class="ibox-title">
-	                <h5>提示框</h5>
-	                </div>
-	                <div class="ibox-content">
-	                    <p>通过调用<code>$.modal.msg()</code>实现。 </p>
-	                    <button type="button" class="btn btn-primary" onclick="$.modal.msg('Hi，你好！')">普通</button>
-	                    <button type="button" class="btn btn-success" onclick="$.modal.msgSuccess('Hi，你好！')">成功</button>
-	                    <button type="button" class="btn btn-warning" onclick="$.modal.msgWarning('Hi，你好！')">警告</button>
-	                    <button type="button" class="btn btn-danger" onclick="$.modal.msgError('Hi，你好！')">失败</button>
-	                </div>
-	            </div>
-	        </div>
-	    </div>
-	
-	    <div class="row">
-	        <div class="col-sm-6">
-	            <div class="ibox">
-	                <div class="ibox-title">
-	                <h5>询问框</h5>
-	                </div>
-	                <div class="ibox-content">
-	                    <p>通过调用<code>$.modal.confirm()</code>实现。 </p>
-	                    <button type="button" class="btn btn-primary" id="button-confirm">询问按钮</button>
-	                </div>
-	            </div>
-	        </div>
-	        
-	        <div class="col-sm-6">
-	            <div class="ibox ">
-	                <div class="ibox-title">
-	                <h5>消息提示并刷新父窗体</h5>
-	                </div>
-	                <div class="ibox-content">
-	                    <p>通过调用<code>$.modal.msgReload()</code>实现。 </p>
-	                    <button type="button" class="btn btn-primary" id="button-msgReload">提示刷新按钮</button>
-	                </div>
-	            </div>
-	        </div>
-	        
-	        <div class="col-sm-6">
-	            <div class="ibox">
-	                <div class="ibox-title">
-	                <h5>普通弹出层</h5>
-	                </div>
-	                <div class="ibox-content">
-	                    <p>通过调用<code>$.modal.open()</code>实现。 </p>
-	                    <button type="button" class="btn btn-primary" id="button-open-1">默认</button>
-	                    <button type="button" class="btn btn-success" id="button-open-2">设置宽高</button>
-	                    <button type="button" class="btn btn-warning" id="button-open-3">回调函数</button>
-	                    <button type="button" class="btn btn-danger" id="button-open-4">自定义选项</button>
-	                    <button type="button" class="btn btn-primary" id="button-open-5">全屏弹出</button>
-	                </div>
-	            </div>
-	        </div>
-	        
-	        <div class="col-sm-6">
-	            <div class="ibox">
-	                <div class="ibox-title">
-	                <h5>选卡页方式</h5>
-	                </div>
-	                <div class="ibox-content">
-	                    <p>通过调用<code>$.modal.openTab()</code>实现。 </p>
-	                    <button type="button" class="btn btn-primary" id="button-open-6">打开</button>
-	                    <button type="button" class="btn btn-warning" id="button-open-7">关闭</button>
-	                </div>
-	            </div>
-	        </div>
-	        
-	        <div class="col-sm-6">
-	            <div class="ibox">
-	                <div class="ibox-title">
-	                <h5>其他内容</h5>
-	                </div>
-	                <div class="ibox-content">
-	                    <p>通过调用<code>layer</code>实现。 </p>
-	                    <button type="button" class="btn btn-primary" id="button-open-8">tab层</button>
-	                    <button type="button" class="btn btn-primary" id="button-open-9">prompt层</button>
-	                    <button type="button" class="btn btn-primary" id="button-open-10">捕获页</button>
-	                </div>
-	            </div>
-	        </div>
-	        
-	        <div class="col-sm-6">
-	            <div class="ibox">
-	                <div class="ibox-title">
-	                <h5>遮罩层</h5>
-	                </div>
-	                <div class="ibox-content">
-	                    <p>通过调用<code>blockUI</code>实现。 </p>
-	                    <button type="button" class="btn btn-primary" id="button-open-11">打开</button>
-	                    <button type="button" class="btn btn-warning" id="button-open-12">关闭</button>
-	                    <button type="button" class="btn btn-primary" id="button-open-13">layer遮罩</button>
-	                </div>
-	            </div>
-	        </div>
-	        
-	        <div class="col-sm-12">
-	            <div class="ibox">
-	                <div class="ibox-title">
-                        <label class="font-noraml">相关参数详细信息</label>
-                        <div><a href="http://doc.ruoyi.vip/#/standard/zjwd?id=layer" target="_blank">http://doc.ruoyi.vip/#/standard/zjwd?id=layer</a></div>
-	            </div>
-	        </div>
-	        
-	    </div>
-	</div>
-    <th:block th:include="include :: footer" />
-    <script type="text/javascript">
-        var prefix = ctx + "demo/modal";
-        
-	    $("#button-confirm").click(function(){
-	    	$.modal.confirm("确认要点击确定吗?", function() {
-	    		$.modal.alert("ok");
-	    	});
-	    })
-	    
-	    $("#button-msgReload").click(function(){
-	        $.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS);
-	    })
-	    
-	    $("#button-open-1").click(function(){
-	    	$.modal.open('添加用户', prefix + "/form");
-	    })
-	    
-	    $("#button-open-2").click(function(){
-	    	$.modal.open('添加用户', prefix + "/form", '900', '320');
-	    })
-	    
-	    $("#button-open-3").click(function(){
-	    	$.modal.open('添加用户', prefix + "/form", '900', '320', callback);
-	    })
-	    
-	    $("#button-open-4").click(function(){
-	    	var btn = ['<i class="fa fa-check"></i> 点我回调', '<i class="fa fa-close"></i> 点我关闭'];
-			var options = {
-				title: '添加用户',
-				width: "900",
-				height: "320",
-				url: prefix + "/form",
-				btn: btn,
-				callBack: doSubmit
-			};
-			$.modal.openOptions(options);
-	    })
-	    
-	    function doSubmit(index, layero) {
-	    	alert("进入了自定义选项提交方法");
-	    }
-	    
-	    function callback(index, layero) {
-	    	alert("进入了回调函数提交方法");
-	    }
-	    
-	    $("#button-open-5").click(function(){
-	    	$.modal.openFull('添加用户', prefix + "/form");
-	    })
-	    
-	    $("#button-open-6").click(function(){
-	    	$.modal.openTab('添加用户', prefix + "/form");
-	    })
-	    
-	    $("#button-open-7").click(function(){
-	    	$.modal.closeTab();
-	    })
-	    
-	     $("#button-open-8").click(function(){
-	    	//tab层
-	    	 layer.tab({
-	    	     area: ['600px', '300px'],
-	    	     tab: [{
-	    	         title: 'TAB1',
-	    	         content: '内容1'
-	    	     },
-	    	     {
-	    	         title: 'TAB2',
-	    	         content: '内容2'
-	    	     },
-	    	     {
-	    	         title: 'TAB3',
-	    	         content: '内容3'
-	    	     }]
-	    	 });
-	    })
-	    
-	    $("#button-open-9").click(function(){
-	    	layer.prompt({title: '输入任何口令，并确认', formType: 1}, function(pass, index){
-	    	  layer.close(index);
-	    	  layer.prompt({title: '随便写点啥，并确认', formType: 2}, function(text, index){
-	    	    layer.close(index);
-	    	    layer.msg('演示完毕！您的口令：'+ pass +'<br>您最后写下了：'+text);
-	    	  });
-	    	});
-	    })
-	    
-	    $("#button-open-10").click(function(){
-	    	layer.open({
-    		  type: 1,
-    		  shade: false,
-    		  title: false, //不显示标题
-    		  content: $('#test'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
-    		  cancel: function(){
-    		    layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6});
-    		  }
-    		});
-	    })
-	    
-	    $("#button-open-11").click(function(){
-	    	$.modal.loading("数据加载中");
-	    })
-	    
-	    $("#button-open-12").click(function(){
-	    	$.modal.closeLoading();
-	    })
-	    
-	    $("#button-open-13").click(function(){
-	    	layer.load(0, {shade: false}); // 0代表加载的风格，支持0-2
-	    })
-	</script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/table.html b/ruoyi-admin/src/main/resources/templates/demo/modal/table.html
deleted file mode 100644
index e93131830..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/modal/table.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('弹层表格')" />
-</head>
-<body class="gray-bg">
-	<div class="wrapper wrapper-content fadeInRight">
-	    <div class="row">
-	        <div class="col-sm-12">
-	            <div class="ibox">
-	                <div class="ibox-title">
-	                <h5>弹层框</h5>
-	                </div>
-	                <div class="ibox-content" id="test">
-	                    <p>弹出复选框表格及单选框表格（点击提交后得到数据）。 </p>
-	                    <button type="button" class="btn btn-primary" onclick="selectCheckUser()">弹出表格（复选框）</button>
-	                    <button type="button" class="btn btn-success" onclick="selectRadioUser()">弹出表格（单选框）</button>
-	                </div>
-	            </div>
-	        </div>
-	        <div class="col-sm-12">
-	            <div class="ibox">
-	                <div class="ibox-title">
-	                <h5>弹层框</h5>
-	                </div>
-	                <div class="ibox-content" id="test">
-	                    <p>弹出复选框表格及单选框表格（点击提交后得到数据并回显到父窗体）。 </p>
-	                    <button type="button" class="btn btn-info" onclick="selectUsersToParent()">弹出表格（复选框）</button>
-	                    <p id="userids"> </p>
-	                </div>
-	            </div>
-	        </div>
-	    </div>
-	</div>
-    <th:block th:include="include :: footer" />
-    <script type="text/javascript">
-        var prefix = ctx + "demo/modal";
-        
-        function selectCheckUser(){
-        	$.modal.open("选择用户", prefix + "/check");
-        }
-        
-		function selectRadioUser(){
-			$.modal.open("选择用户", prefix + "/radio");
-        }
-		
-		function selectUsersToParent(){
-			$.modal.open("选择用户", prefix + "/parent");
-        }
-		
-		function selectUsers(){
-			alert(1);
-		}
-	</script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/table/check.html b/ruoyi-admin/src/main/resources/templates/demo/modal/table/check.html
deleted file mode 100644
index cf8d178d1..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/modal/table/check.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('check表格页')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-        
-        /* 添加用户-选择用户-提交 */
-		function submitHandler() {
-			var rows = $.table.selectFirstColumns();
-			if (rows.length == 0) {
-       			$.modal.alertWarning("请至少选择一条记录");
-       			return;
-       		}
-			alert(rows.join());
-		}
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/table/parent.html b/ruoyi-admin/src/main/resources/templates/demo/modal/table/parent.html
deleted file mode 100644
index 14f59dcc7..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/modal/table/parent.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('表格传值给父页面')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-        
-        /* 添加用户-选择用户-提交 */
-		function submitHandler(index, layero) {
-			var rows = $.table.selectFirstColumns();
-			if (rows.length == 0) {
-       			$.modal.alertWarning("请至少选择一条记录");
-       			return;
-       		}
-			$.modal.close();
-			// 父页面的方法
-			// parent.selectUsers();
-			// 父页面的变量
-			parent.$('#userids').html(rows.join());
-		}
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/table/radio.html b/ruoyi-admin/src/main/resources/templates/demo/modal/table/radio.html
deleted file mode 100644
index 4c9607dfc..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/modal/table/radio.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('radio表格页')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-                columns: [{
-		            radio: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-        
-        /* 添加用户-选择用户-提交 */
-		function submitHandler() {
-			var rows = $.table.selectFirstColumns();
-			if (rows.length == 0) {
-       			$.modal.alertWarning("请至少选择一条记录");
-       			return;
-       		}
-			alert(rows.join());
-		}
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/add.html b/ruoyi-admin/src/main/resources/templates/demo/operate/add.html
deleted file mode 100644
index dcee93d5f..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/operate/add.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-	<th:block th:include="include :: header('新增用户')" />
-</head>
-<body class="white-bg">
-	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
-		<form class="form-horizontal m" id="form-user-add">
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户编号：</label>
-				<div class="col-sm-8">
-					<input class="form-control" type="text" name="userCode" id="userCode" required>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label ">用户姓名：</label>
-				<div class="col-sm-8">
-					<input class="form-control" type="text" name="userName" id="userName" required>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户性别：</label>
-                <div class="col-sm-8">
-                    <div class="input-group" style="width: 100%">
-                        <select name="userSex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
-			                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-			            </select>
-                    </div>
-                </div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户手机：</label>
-				<div class="col-sm-8">
-					<input class="form-control" type="text" name="userPhone" id="userPhone">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户邮箱：</label>
-				<div class="col-sm-8">
-					<input class="form-control" type="text" name="userEmail" id="userEmail">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户状态：</label>
-				<div class="col-sm-8">
-				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
-						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
-						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
-					</div>
-				</div>
-			</div>
-		</form>
-	</div>
-	<th:block th:include="include :: footer" />
-	<script type="text/javascript">
-		var prefix = ctx + "demo/operate";
-		
-		$("#form-user-add").validate({
-			onkeyup: false,
-			rules:{
-				userPhone:{
-					isPhone:true
-				},
-				userEmail:{
-					email:true
-				},
-			},
-		    focusCleanup: true
-		});
-		
-		function submitHandler() {
-	        if ($.validate.form()) {
-	        	$.operate.save(prefix + "/add", $('#form-user-add').serialize());
-	        }
-	    }
-	</script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/detail.html b/ruoyi-admin/src/main/resources/templates/demo/operate/detail.html
deleted file mode 100644
index 42eda918c..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/operate/detail.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-	<th:block th:include="include :: header('用户详细')" />
-</head>
-<body class="white-bg">
-	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
-		<form class="form-horizontal m" id="form-user-edit">
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户编号：</label>
-				<div class="form-control-static" th:text="${user.userCode}"></div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label ">用户姓名：</label>
-				<div class="col-sm-8">
-				    <div class="form-control-static" th:text="${user.userName}"></div>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户性别：</label>
-                <div class="col-sm-8">
-                    <div class="form-control-static" th:text="${@dict.getLabel('sys_user_sex', user.status)}"></div>
-                </div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户手机：</label>
-				<div class="col-sm-8">
-				    <div class="form-control-static" th:text="${user.userPhone}"></div>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户邮箱：</label>
-				<div class="col-sm-8">
-				    <div class="form-control-static" th:text="${user.userEmail}"></div>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户状态：</label>
-				<div class="col-sm-8">
-				    <div class="form-control-static" th:text="${@dict.getLabel('sys_normal_disable', user.status)}"></div>
-				</div>
-			</div>
-		</form>
-	</div>
-	<th:block th:include="include :: footer" />
-	<script type="text/javascript">
-		var prefix = ctx + "demo/operate";
-		
-		$("#form-user-add").validate({
-			onkeyup: false,
-			rules:{
-				userPhone:{
-					isPhone:true
-				},
-				userEmail:{
-					email:true
-				},
-			},
-		    focusCleanup: true
-		});
-		
-		function submitHandler() {
-	        if ($.validate.form()) {
-	        	$.operate.save(prefix + "/edit", $('#form-user-edit').serialize());
-	        }
-	    }
-	</script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/edit.html b/ruoyi-admin/src/main/resources/templates/demo/operate/edit.html
deleted file mode 100644
index d7d87fcfb..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/operate/edit.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-	<th:block th:include="include :: header('修改用户')" />
-</head>
-<body class="white-bg">
-	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
-		<form class="form-horizontal m" id="form-user-edit" th:object="${user}">
-		    <input name="userId" type="hidden"  th:field="*{userId}" />
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户编号：</label>
-				<div class="col-sm-8">
-					<input class="form-control" type="text" name="userCode" id="userCode" th:field="*{userCode}" required>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label ">用户姓名：</label>
-				<div class="col-sm-8">
-					<input class="form-control" type="text" name="userName" id="userName" th:field="*{userName}" required>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户性别：</label>
-                <div class="col-sm-8">
-                    <div class="input-group" style="width: 100%">
-                        <select name="userSex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
-			                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{userSex}"></option>
-			            </select>
-                    </div>
-                </div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户手机：</label>
-				<div class="col-sm-8">
-					<input class="form-control" type="text" name="userPhone" th:field="*{userPhone}" id="userPhone">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户邮箱：</label>
-				<div class="col-sm-8">
-					<input class="form-control" type="text" name="userEmail" th:field="*{userEmail}" id="userEmail">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">用户状态：</label>
-				<div class="col-sm-8">
-				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
-						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}">
-						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
-					</div>
-				</div>
-			</div>
-		</form>
-	</div>
-	<th:block th:include="include :: footer" />
-	<script type="text/javascript">
-		var prefix = ctx + "demo/operate";
-		
-		$("#form-user-add").validate({
-			onkeyup: false,
-			rules:{
-				userPhone:{
-					isPhone:true
-				},
-				userEmail:{
-					email:true
-				},
-			},
-		    focusCleanup: true
-		});
-		
-		function submitHandler() {
-	        if ($.validate.form()) {
-	        	$.operate.save(prefix + "/edit", $('#form-user-edit').serialize());
-	        }
-	    }
-	</script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/other.html b/ruoyi-admin/src/main/resources/templates/demo/operate/other.html
deleted file mode 100644
index 3887c4c23..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/operate/other.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('其他操作')" />
-</head>
-<body class="gray-bg">
-      
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/table.html b/ruoyi-admin/src/main/resources/templates/demo/operate/table.html
deleted file mode 100644
index aff8c139e..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/operate/table.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('其他操作')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-     	<div class="btn-group-sm" id="toolbar" role="group">
-	        <a class="btn btn-success" onclick="$.operate.add()">
-	            <i class="fa fa-plus"></i> 新增
-	        </a>
-	        <a class="btn btn-primary btn-edit disabled" onclick="$.operate.edit()">
-	            <i class="fa fa-edit"></i> 修改
-	        </a>
-	        <a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()">
-	            <i class="fa fa-remove"></i> 删除
-	        </a>
-	        <a class="btn btn-info" onclick="$.table.importExcel()">
-	            <i class="fa fa-upload"></i> 导入
-	        </a>
-	        <a class="btn btn-warning" onclick="$.table.exportExcel()">
-	            <i class="fa fa-download"></i> 导出
-	        </a>
-	        <a class="btn btn-info btn-detail disabled" onclick="$.operate.detail()">
-	            <i class="fa fa-search"></i> 详细
-	        </a>
-	        <a class="btn btn-danger" onclick="$.operate.clean()">
-	            <i class="fa fa-trash"></i> 清空
-	        </a>
-        </div>
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/operate";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                importUrl: prefix + "/importData",
-                importTemplateUrl: prefix + "/importTemplate",
-                detailUrl: prefix + "/detail/{id}",
-                cleanUrl: prefix + "/clean",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-		        search: true,
-		        modalName: "用户",
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#" onclick="$.operate.edit(\'' + row.userId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-info btn-xs" href="#" onclick="$.operate.detail(\'' + row.userId + '\')"><i class="fa fa-search"></i>详细</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#" onclick="$.operate.remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-<!-- 导入区域 -->
-<form id="importForm" enctype="multipart/form-data" class="mt20 mb10" style="display: none;">
-	<div class="col-xs-offset-1">
-		<input type="file" id="file" name="file"/>
-		<div class="mt10 pt5">
-			<input type="checkbox" id="updateSupport" name="updateSupport" title="如果登录账户已经存在，更新这条数据。"> 是否更新已经存在的用户数据
-			 &nbsp;	<a onclick="$.table.importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 下载模板</a>
-		</div>
-		<font color="red" class="pull-left mt10">
-			提示：仅允许导入“xls”或“xlsx”格式文件！
-		</font>
-	</div>
-</form>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/report/echarts.html b/ruoyi-admin/src/main/resources/templates/demo/report/echarts.html
deleted file mode 100644
index 31c63dc08..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/report/echarts.html
+++ /dev/null
@@ -1,1494 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('百度ECharts')" />
-</head>
-<body class="gray-bg">
-	<div class="row  border-bottom white-bg dashboard-header">
-        <div class="col-sm-12">
-            <p>ECharts开源来自百度商业前端数据可视化团队，基于html5 Canvas，是一个纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据可视化图表。创新的拖拽重计算、数据视图、值域漫游等特性大大增强了用户体验，赋予了用户对数据进行挖掘、整合的能力。 <a href="http://echarts.baidu.com/doc/about.html" target="_blank">了解更多</a>
-            </p>
-            <p>ECharts官网：<a href="http://echarts.baidu.com/" target="_blank">http://echarts.baidu.com/</a>
-            </p>
-
-        </div>
-    </div>
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>折线图</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_flot.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_flot.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_flot.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="echarts" id="echarts-line-chart"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>柱状图</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_flot.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_flot.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_flot.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-
-                        <div class="echarts" id="echarts-bar-chart"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>散点图</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_flot.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_flot.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_flot.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="echarts" id="echarts-scatter-chart"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>K线图</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_flot.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_flot.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_flot.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="echarts" id="echarts-k-chart"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>饼状图</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_flot.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_flot.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_flot.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="echarts" id="echarts-pie-chart"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>雷达图</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_flot.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_flot.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_flot.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="echarts" id="echarts-radar-chart"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>和弦图</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_flot.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_flot.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_flot.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="echarts" id="echarts-chord-chart"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>仪表盘</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_flot.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_flot.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_flot.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="echarts" id="echarts-gauge-chart"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>漏斗图</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_flot.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_flot.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_flot.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="echarts" id="echarts-funnel-chart"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>力导向布局图</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_flot.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_flot.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_flot.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="echarts" id="echarts-force-chart"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>中国地图</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_flot.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_flot.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_flot.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content">
-                        <div style="height:600px" id="echarts-map-chart"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: echarts-js" />
-    <script type="text/javascript">
-	    $(function () {
-	        var lineChart = echarts.init(document.getElementById("echarts-line-chart"));
-	        var lineoption = {
-	            title : {
-	                text: '未来一周气温变化'
-	            },
-	            tooltip : {
-	                trigger: 'axis'
-	            },
-	            legend: {
-	                data:['最高气温','最低气温']
-	            },
-	            grid:{
-	                x:40,
-	                x2:40,
-	                y2:24
-	            },
-	            calculable : true,
-	            xAxis : [
-	                {
-	                    type : 'category',
-	                    boundaryGap : false,
-	                    data : ['周一','周二','周三','周四','周五','周六','周日']
-	                }
-	            ],
-	            yAxis : [
-	                {
-	                    type : 'value',
-	                    axisLabel : {
-	                        formatter: '{value} °C'
-	                    }
-	                }
-	            ],
-	            series : [
-	                {
-	                    name:'最高气温',
-	                    type:'line',
-	                    data:[11, 11, 15, 13, 12, 13, 10],
-	                    markPoint : {
-	                        data : [
-	                            {type : 'max', name: '最大值'},
-	                            {type : 'min', name: '最小值'}
-	                        ]
-	                    },
-	                    markLine : {
-	                        data : [
-	                            {type : 'average', name: '平均值'}
-	                        ]
-	                    }
-	                },
-	                {
-	                    name:'最低气温',
-	                    type:'line',
-	                    data:[1, -2, 2, 5, 3, 2, 0],
-	                    markPoint : {
-	                        data : [
-	                            {name : '周最低', value : -2, xAxis: 1, yAxis: -1.5}
-	                        ]
-	                    },
-	                    markLine : {
-	                        data : [
-	                            {type : 'average', name : '平均值'}
-	                        ]
-	                    }
-	                }
-	            ]
-	        };
-	        lineChart.setOption(lineoption);
-	        $(window).resize(lineChart.resize);
-	
-	        var barChart = echarts.init(document.getElementById("echarts-bar-chart"));
-	        var baroption = {
-	            title : {
-	                text: '某地区蒸发量和降水量'
-	            },
-	            tooltip : {
-	                trigger: 'axis'
-	            },
-	            legend: {
-	                data:['蒸发量','降水量']
-	            },
-	            grid:{
-	                x:30,
-	                x2:40,
-	                y2:24
-	            },
-	            calculable : true,
-	            xAxis : [
-	                {
-	                    type : 'category',
-	                    data : ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月']
-	                }
-	            ],
-	            yAxis : [
-	                {
-	                    type : 'value'
-	                }
-	            ],
-	            series : [
-	                {
-	                    name:'蒸发量',
-	                    type:'bar',
-	                    data:[2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3],
-	                    markPoint : {
-	                        data : [
-	                            {type : 'max', name: '最大值'},
-	                            {type : 'min', name: '最小值'}
-	                        ]
-	                    },
-	                    markLine : {
-	                        data : [
-	                            {type : 'average', name: '平均值'}
-	                        ]
-	                    }
-	                },
-	                {
-	                    name:'降水量',
-	                    type:'bar',
-	                    data:[2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3],
-	                    markPoint : {
-	                        data : [
-	                            {name : '年最高', value : 182.2, xAxis: 7, yAxis: 183, symbolSize:18},
-	                            {name : '年最低', value : 2.3, xAxis: 11, yAxis: 3}
-	                        ]
-	                    },
-	                    markLine : {
-	                        data : [
-	                            {type : 'average', name : '平均值'}
-	                        ]
-	                    }
-	                }
-	            ]
-	        };
-	        barChart.setOption(baroption);
-	
-	        window.onresize = barChart.resize;
-	
-	        var scatterChart = echarts.init(document.getElementById("echarts-scatter-chart"));
-	        var scatteroption = {
-	            title : {
-	                text: '男性女性身高体重分布',
-	                subtext: '抽样调查来自: Heinz  2003'
-	            },
-	            tooltip : {
-	                trigger: 'axis',
-	                showDelay : 0,
-	                axisPointer:{
-	                    type : 'cross',
-	                    lineStyle: {
-	                        type : 'dashed',
-	                        width : 1
-	                    }
-	                }
-	            },
-	            legend: {
-	                data:['女性','男性']
-	            },
-	            grid:{
-	                x:45,
-	                x2:40,
-	                y2:24
-	            },
-	            xAxis : [
-	                {
-	                    type : 'value',
-	                    scale:true,
-	                    axisLabel : {
-	                        formatter: '{value} cm'
-	                    }
-	                }
-	            ],
-	            yAxis : [
-	                {
-	                    type : 'value',
-	                    scale:true,
-	                    axisLabel : {
-	                        formatter: '{value} kg'
-	                    }
-	                }
-	            ],
-	            series : [
-	                {
-	                    name:'女性',
-	                    type:'scatter',
-	                    tooltip : {
-	                        trigger: 'item',
-	                        formatter : function (params) {
-	                            if (params.value.length > 1) {
-	                                return params.seriesName + ' :<br/>'
-	                                   + params.value[0] + 'cm '
-	                                   + params.value[1] + 'kg ';
-	                            }
-	                            else {
-	                                return params.seriesName + ' :<br/>'
-	                                   + params.name + ' : '
-	                                   + params.value + 'kg ';
-	                            }
-	                        }
-	                    },
-	                    data: [
-	                        [161.2, 51.6], [167.5, 59.0], [159.5, 49.2], [157.0, 63.0], [155.8, 53.6],
-	                        [170.0, 59.0], [159.1, 47.6], [166.0, 69.8], [176.2, 66.8], [160.2, 75.2],
-	                        [172.5, 55.2], [170.9, 54.2], [172.9, 62.5], [153.4, 42.0], [160.0, 50.0],
-	                        [147.2, 49.8], [168.2, 49.2], [175.0, 73.2], [157.0, 47.8], [167.6, 68.8],
-	                        [159.5, 50.6], [175.0, 82.5], [166.8, 57.2], [176.5, 87.8], [170.2, 72.8],
-	                        [174.0, 54.5], [173.0, 59.8], [179.9, 67.3], [170.5, 67.8], [160.0, 47.0],
-	                        [154.4, 46.2], [162.0, 55.0], [176.5, 83.0], [160.0, 54.4], [152.0, 45.8],
-	                        [162.1, 53.6], [170.0, 73.2], [160.2, 52.1], [161.3, 67.9], [166.4, 56.6],
-	                        [168.9, 62.3], [163.8, 58.5], [167.6, 54.5], [160.0, 50.2], [161.3, 60.3],
-	                        [167.6, 58.3], [165.1, 56.2], [160.0, 50.2], [170.0, 72.9], [157.5, 59.8],
-	                        [167.6, 61.0], [160.7, 69.1], [163.2, 55.9], [152.4, 46.5], [157.5, 54.3],
-	                        [168.3, 54.8], [180.3, 60.7], [165.5, 60.0], [165.0, 62.0], [164.5, 60.3],
-	                        [156.0, 52.7], [160.0, 74.3], [163.0, 62.0], [165.7, 73.1], [161.0, 80.0],
-	                        [162.0, 54.7], [166.0, 53.2], [174.0, 75.7], [172.7, 61.1], [167.6, 55.7],
-	                        [151.1, 48.7], [164.5, 52.3], [163.5, 50.0], [152.0, 59.3], [169.0, 62.5],
-	                        [164.0, 55.7], [161.2, 54.8], [155.0, 45.9], [170.0, 70.6], [176.2, 67.2],
-	                        [170.0, 69.4], [162.5, 58.2], [170.3, 64.8], [164.1, 71.6], [169.5, 52.8],
-	                        [163.2, 59.8], [154.5, 49.0], [159.8, 50.0], [173.2, 69.2], [170.0, 55.9],
-	                        [161.4, 63.4], [169.0, 58.2], [166.2, 58.6], [159.4, 45.7], [162.5, 52.2],
-	                        [159.0, 48.6], [162.8, 57.8], [159.0, 55.6], [179.8, 66.8], [162.9, 59.4],
-	                        [161.0, 53.6], [151.1, 73.2], [168.2, 53.4], [168.9, 69.0], [173.2, 58.4],
-	                        [171.8, 56.2], [178.0, 70.6], [164.3, 59.8], [163.0, 72.0], [168.5, 65.2],
-	                        [166.8, 56.6], [172.7, 105.2], [163.5, 51.8], [169.4, 63.4], [167.8, 59.0],
-	                        [159.5, 47.6], [167.6, 63.0], [161.2, 55.2], [160.0, 45.0], [163.2, 54.0],
-	                        [162.2, 50.2], [161.3, 60.2], [149.5, 44.8], [157.5, 58.8], [163.2, 56.4],
-	                        [172.7, 62.0], [155.0, 49.2], [156.5, 67.2], [164.0, 53.8], [160.9, 54.4],
-	                        [162.8, 58.0], [167.0, 59.8], [160.0, 54.8], [160.0, 43.2], [168.9, 60.5],
-	                        [158.2, 46.4], [156.0, 64.4], [160.0, 48.8], [167.1, 62.2], [158.0, 55.5],
-	                        [167.6, 57.8], [156.0, 54.6], [162.1, 59.2], [173.4, 52.7], [159.8, 53.2],
-	                        [170.5, 64.5], [159.2, 51.8], [157.5, 56.0], [161.3, 63.6], [162.6, 63.2],
-	                        [160.0, 59.5], [168.9, 56.8], [165.1, 64.1], [162.6, 50.0], [165.1, 72.3],
-	                        [166.4, 55.0], [160.0, 55.9], [152.4, 60.4], [170.2, 69.1], [162.6, 84.5],
-	                        [170.2, 55.9], [158.8, 55.5], [172.7, 69.5], [167.6, 76.4], [162.6, 61.4],
-	                        [167.6, 65.9], [156.2, 58.6], [175.2, 66.8], [172.1, 56.6], [162.6, 58.6],
-	                        [160.0, 55.9], [165.1, 59.1], [182.9, 81.8], [166.4, 70.7], [165.1, 56.8],
-	                        [177.8, 60.0], [165.1, 58.2], [175.3, 72.7], [154.9, 54.1], [158.8, 49.1],
-	                        [172.7, 75.9], [168.9, 55.0], [161.3, 57.3], [167.6, 55.0], [165.1, 65.5],
-	                        [175.3, 65.5], [157.5, 48.6], [163.8, 58.6], [167.6, 63.6], [165.1, 55.2],
-	                        [165.1, 62.7], [168.9, 56.6], [162.6, 53.9], [164.5, 63.2], [176.5, 73.6],
-	                        [168.9, 62.0], [175.3, 63.6], [159.4, 53.2], [160.0, 53.4], [170.2, 55.0],
-	                        [162.6, 70.5], [167.6, 54.5], [162.6, 54.5], [160.7, 55.9], [160.0, 59.0],
-	                        [157.5, 63.6], [162.6, 54.5], [152.4, 47.3], [170.2, 67.7], [165.1, 80.9],
-	                        [172.7, 70.5], [165.1, 60.9], [170.2, 63.6], [170.2, 54.5], [170.2, 59.1],
-	                        [161.3, 70.5], [167.6, 52.7], [167.6, 62.7], [165.1, 86.3], [162.6, 66.4],
-	                        [152.4, 67.3], [168.9, 63.0], [170.2, 73.6], [175.2, 62.3], [175.2, 57.7],
-	                        [160.0, 55.4], [165.1, 104.1], [174.0, 55.5], [170.2, 77.3], [160.0, 80.5],
-	                        [167.6, 64.5], [167.6, 72.3], [167.6, 61.4], [154.9, 58.2], [162.6, 81.8],
-	                        [175.3, 63.6], [171.4, 53.4], [157.5, 54.5], [165.1, 53.6], [160.0, 60.0],
-	                        [174.0, 73.6], [162.6, 61.4], [174.0, 55.5], [162.6, 63.6], [161.3, 60.9],
-	                        [156.2, 60.0], [149.9, 46.8], [169.5, 57.3], [160.0, 64.1], [175.3, 63.6],
-	                        [169.5, 67.3], [160.0, 75.5], [172.7, 68.2], [162.6, 61.4], [157.5, 76.8],
-	                        [176.5, 71.8], [164.4, 55.5], [160.7, 48.6], [174.0, 66.4], [163.8, 67.3]
-	                    ],
-	                    markPoint : {
-	                        data : [
-	                            {type : 'max', name: '最大值'},
-	                            {type : 'min', name: '最小值'}
-	                        ]
-	                    },
-	                    markLine : {
-	                        data : [
-	                            {type : 'average', name: '平均值'}
-	                        ]
-	                    }
-	                },
-	                {
-	                    name:'男性',
-	                    type:'scatter',
-	                    tooltip : {
-	                        trigger: 'item',
-	                        formatter : function (params) {
-	                            if (params.value.length > 1) {
-	                                return params.seriesName + ' :<br/>'
-	                                   + params.value[0] + 'cm '
-	                                   + params.value[1] + 'kg ';
-	                            }
-	                            else {
-	                                return params.seriesName + ' :<br/>'
-	                                   + params.name + ' : '
-	                                   + params.value + 'kg ';
-	                            }
-	                        }
-	                    },
-	                    data: [
-	                        [174.0, 65.6], [175.3, 71.8], [193.5, 80.7], [186.5, 72.6], [187.2, 78.8],
-	                        [181.5, 74.8], [184.0, 86.4], [184.5, 78.4], [175.0, 62.0], [184.0, 81.6],
-	                        [180.0, 76.6], [177.8, 83.6], [192.0, 90.0], [176.0, 74.6], [174.0, 71.0],
-	                        [184.0, 79.6], [192.7, 93.8], [171.5, 70.0], [173.0, 72.4], [176.0, 85.9],
-	                        [176.0, 78.8], [180.5, 77.8], [172.7, 66.2], [176.0, 86.4], [173.5, 81.8],
-	                        [178.0, 89.6], [180.3, 82.8], [180.3, 76.4], [164.5, 63.2], [173.0, 60.9],
-	                        [183.5, 74.8], [175.5, 70.0], [188.0, 72.4], [189.2, 84.1], [172.8, 69.1],
-	                        [170.0, 59.5], [182.0, 67.2], [170.0, 61.3], [177.8, 68.6], [184.2, 80.1],
-	                        [186.7, 87.8], [171.4, 84.7], [172.7, 73.4], [175.3, 72.1], [180.3, 82.6],
-	                        [182.9, 88.7], [188.0, 84.1], [177.2, 94.1], [172.1, 74.9], [167.0, 59.1],
-	                        [169.5, 75.6], [174.0, 86.2], [172.7, 75.3], [182.2, 87.1], [164.1, 55.2],
-	                        [163.0, 57.0], [171.5, 61.4], [184.2, 76.8], [174.0, 86.8], [174.0, 72.2],
-	                        [177.0, 71.6], [186.0, 84.8], [167.0, 68.2], [171.8, 66.1], [182.0, 72.0],
-	                        [167.0, 64.6], [177.8, 74.8], [164.5, 70.0], [192.0, 101.6], [175.5, 63.2],
-	                        [171.2, 79.1], [181.6, 78.9], [167.4, 67.7], [181.1, 66.0], [177.0, 68.2],
-	                        [174.5, 63.9], [177.5, 72.0], [170.5, 56.8], [182.4, 74.5], [197.1, 90.9],
-	                        [180.1, 93.0], [175.5, 80.9], [180.6, 72.7], [184.4, 68.0], [175.5, 70.9],
-	                        [180.6, 72.5], [177.0, 72.5], [177.1, 83.4], [181.6, 75.5], [176.5, 73.0],
-	                        [175.0, 70.2], [174.0, 73.4], [165.1, 70.5], [177.0, 68.9], [192.0, 102.3],
-	                        [176.5, 68.4], [169.4, 65.9], [182.1, 75.7], [179.8, 84.5], [175.3, 87.7],
-	                        [184.9, 86.4], [177.3, 73.2], [167.4, 53.9], [178.1, 72.0], [168.9, 55.5],
-	                        [157.2, 58.4], [180.3, 83.2], [170.2, 72.7], [177.8, 64.1], [172.7, 72.3],
-	                        [165.1, 65.0], [186.7, 86.4], [165.1, 65.0], [174.0, 88.6], [175.3, 84.1],
-	                        [185.4, 66.8], [177.8, 75.5], [180.3, 93.2], [180.3, 82.7], [177.8, 58.0],
-	                        [177.8, 79.5], [177.8, 78.6], [177.8, 71.8], [177.8, 116.4], [163.8, 72.2],
-	                        [188.0, 83.6], [198.1, 85.5], [175.3, 90.9], [166.4, 85.9], [190.5, 89.1],
-	                        [166.4, 75.0], [177.8, 77.7], [179.7, 86.4], [172.7, 90.9], [190.5, 73.6],
-	                        [185.4, 76.4], [168.9, 69.1], [167.6, 84.5], [175.3, 64.5], [170.2, 69.1],
-	                        [190.5, 108.6], [177.8, 86.4], [190.5, 80.9], [177.8, 87.7], [184.2, 94.5],
-	                        [176.5, 80.2], [177.8, 72.0], [180.3, 71.4], [171.4, 72.7], [172.7, 84.1],
-	                        [172.7, 76.8], [177.8, 63.6], [177.8, 80.9], [182.9, 80.9], [170.2, 85.5],
-	                        [167.6, 68.6], [175.3, 67.7], [165.1, 66.4], [185.4, 102.3], [181.6, 70.5],
-	                        [172.7, 95.9], [190.5, 84.1], [179.1, 87.3], [175.3, 71.8], [170.2, 65.9],
-	                        [193.0, 95.9], [171.4, 91.4], [177.8, 81.8], [177.8, 96.8], [167.6, 69.1],
-	                        [167.6, 82.7], [180.3, 75.5], [182.9, 79.5], [176.5, 73.6], [186.7, 91.8],
-	                        [188.0, 84.1], [188.0, 85.9], [177.8, 81.8], [174.0, 82.5], [177.8, 80.5],
-	                        [171.4, 70.0], [185.4, 81.8], [185.4, 84.1], [188.0, 90.5], [188.0, 91.4],
-	                        [182.9, 89.1], [176.5, 85.0], [175.3, 69.1], [175.3, 73.6], [188.0, 80.5],
-	                        [188.0, 82.7], [175.3, 86.4], [170.5, 67.7], [179.1, 92.7], [177.8, 93.6],
-	                        [175.3, 70.9], [182.9, 75.0], [170.8, 93.2], [188.0, 93.2], [180.3, 77.7],
-	                        [177.8, 61.4], [185.4, 94.1], [168.9, 75.0], [185.4, 83.6], [180.3, 85.5],
-	                        [174.0, 73.9], [167.6, 66.8], [182.9, 87.3], [160.0, 72.3], [180.3, 88.6],
-	                        [167.6, 75.5], [186.7, 101.4], [175.3, 91.1], [175.3, 67.3], [175.9, 77.7],
-	                        [175.3, 81.8], [179.1, 75.5], [181.6, 84.5], [177.8, 76.6], [182.9, 85.0],
-	                        [177.8, 102.5], [184.2, 77.3], [179.1, 71.8], [176.5, 87.9], [188.0, 94.3],
-	                        [174.0, 70.9], [167.6, 64.5], [170.2, 77.3], [167.6, 72.3], [188.0, 87.3],
-	                        [174.0, 80.0], [176.5, 82.3], [180.3, 73.6], [167.6, 74.1], [188.0, 85.9],
-	                        [180.3, 73.2], [167.6, 76.3], [183.0, 65.9], [183.0, 90.9], [179.1, 89.1],
-	                        [170.2, 62.3], [177.8, 82.7], [179.1, 79.1], [190.5, 98.2], [177.8, 84.1],
-	                        [180.3, 83.2], [180.3, 83.2]
-	                    ],
-	                    markPoint : {
-	                        data : [
-	                            {type : 'max', name: '最大值'},
-	                            {type : 'min', name: '最小值'}
-	                        ]
-	                    },
-	                    markLine : {
-	                        data : [
-	                            {type : 'average', name: '平均值'}
-	                        ]
-	                    }
-	                }
-	            ]
-	        };
-	        scatterChart.setOption(scatteroption);
-	        $(window).resize(scatterChart.resize);
-	
-	
-	        var kChart = echarts.init(document.getElementById("echarts-k-chart"));
-	        var koption = {
-	            title : {
-	                text: '2013年上半年上证指数'
-	            },
-	            tooltip : {
-	                trigger: 'axis',
-	                formatter: function (params) {
-	                    var res = params[0].seriesName + ' ' + params[0].name;
-	                    res += '<br/>  开盘 : ' + params[0].value[0] + '  最高 : ' + params[0].value[3];
-	                    res += '<br/>  收盘 : ' + params[0].value[1] + '  最低 : ' + params[0].value[2];
-	                    return res;
-	                }
-	            },
-	            legend: {
-	                data:['上证指数']
-	            },
-	            grid:{
-	                x:40,
-	                x2:2
-	            },
-	            dataZoom : {
-	                show : true,
-	                realtime: true,
-	                start : 50,
-	                end : 100
-	            },
-	            xAxis : [
-	                {
-	                    type : 'category',
-	                    boundaryGap : true,
-	                    axisTick: {onGap:false},
-	                    splitLine: {show:false},
-	                    data : [
-	                        "2013/1/24", "2013/1/25", "2013/1/28", "2013/1/29", "2013/1/30",
-	                        "2013/1/31", "2013/2/1", "2013/2/4", "2013/2/5", "2013/2/6",
-	                        "2013/2/7", "2013/2/8", "2013/2/18", "2013/2/19", "2013/2/20",
-	                        "2013/2/21", "2013/2/22", "2013/2/25", "2013/2/26", "2013/2/27",
-	                        "2013/2/28", "2013/3/1", "2013/3/4", "2013/3/5", "2013/3/6",
-	                        "2013/3/7", "2013/3/8", "2013/3/11", "2013/3/12", "2013/3/13",
-	                        "2013/3/14", "2013/3/15", "2013/3/18", "2013/3/19", "2013/3/20",
-	                        "2013/3/21", "2013/3/22", "2013/3/25", "2013/3/26", "2013/3/27",
-	                        "2013/3/28", "2013/3/29", "2013/4/1", "2013/4/2", "2013/4/3",
-	                        "2013/4/8", "2013/4/9", "2013/4/10", "2013/4/11", "2013/4/12",
-	                        "2013/4/15", "2013/4/16", "2013/4/17", "2013/4/18", "2013/4/19",
-	                        "2013/4/22", "2013/4/23", "2013/4/24", "2013/4/25", "2013/4/26",
-	                        "2013/5/2", "2013/5/3", "2013/5/6", "2013/5/7", "2013/5/8",
-	                        "2013/5/9", "2013/5/10", "2013/5/13", "2013/5/14", "2013/5/15",
-	                        "2013/5/16", "2013/5/17", "2013/5/20", "2013/5/21", "2013/5/22",
-	                        "2013/5/23", "2013/5/24", "2013/5/27", "2013/5/28", "2013/5/29",
-	                        "2013/5/30", "2013/5/31", "2013/6/3", "2013/6/4", "2013/6/5",
-	                        "2013/6/6", "2013/6/7", "2013/6/13"
-	                    ]
-	                }
-	            ],
-	            yAxis : [
-	                {
-	                    type : 'value',
-	                    scale:true,
-	                    boundaryGap: [0.01, 0.01]
-	                }
-	            ],
-	            series : [
-	                {
-	                    name:'上证指数',
-	                    type:'k',
-	                    data:[ // 开盘，收盘，最低，最高
-	                        [2320.26,2302.6,2287.3,2362.94],
-	                        [2300,2291.3,2288.26,2308.38],
-	                        [2295.35,2346.5,2295.35,2346.92],
-	                        [2347.22,2358.98,2337.35,2363.8],
-	                        [2360.75,2382.48,2347.89,2383.76],
-	                        [2383.43,2385.42,2371.23,2391.82],
-	                        [2377.41,2419.02,2369.57,2421.15],
-	                        [2425.92,2428.15,2417.58,2440.38],
-	                        [2411,2433.13,2403.3,2437.42],
-	                        [2432.68,2434.48,2427.7,2441.73],
-	                        [2430.69,2418.53,2394.22,2433.89],
-	                        [2416.62,2432.4,2414.4,2443.03],
-	                        [2441.91,2421.56,2415.43,2444.8],
-	                        [2420.26,2382.91,2373.53,2427.07],
-	                        [2383.49,2397.18,2370.61,2397.94],
-	                        [2378.82,2325.95,2309.17,2378.82],
-	                        [2322.94,2314.16,2308.76,2330.88],
-	                        [2320.62,2325.82,2315.01,2338.78],
-	                        [2313.74,2293.34,2289.89,2340.71],
-	                        [2297.77,2313.22,2292.03,2324.63],
-	                        [2322.32,2365.59,2308.92,2366.16],
-	                        [2364.54,2359.51,2330.86,2369.65],
-	                        [2332.08,2273.4,2259.25,2333.54],
-	                        [2274.81,2326.31,2270.1,2328.14],
-	                        [2333.61,2347.18,2321.6,2351.44],
-	                        [2340.44,2324.29,2304.27,2352.02],
-	                        [2326.42,2318.61,2314.59,2333.67],
-	                        [2314.68,2310.59,2296.58,2320.96],
-	                        [2309.16,2286.6,2264.83,2333.29],
-	                        [2282.17,2263.97,2253.25,2286.33],
-	                        [2255.77,2270.28,2253.31,2276.22],
-	                        [2269.31,2278.4,2250,2312.08],
-	                        [2267.29,2240.02,2239.21,2276.05],
-	                        [2244.26,2257.43,2232.02,2261.31],
-	                        [2257.74,2317.37,2257.42,2317.86],
-	                        [2318.21,2324.24,2311.6,2330.81],
-	                        [2321.4,2328.28,2314.97,2332],
-	                        [2334.74,2326.72,2319.91,2344.89],
-	                        [2318.58,2297.67,2281.12,2319.99],
-	                        [2299.38,2301.26,2289,2323.48],
-	                        [2273.55,2236.3,2232.91,2273.55],
-	                        [2238.49,2236.62,2228.81,2246.87],
-	                        [2229.46,2234.4,2227.31,2243.95],
-	                        [2234.9,2227.74,2220.44,2253.42],
-	                        [2232.69,2225.29,2217.25,2241.34],
-	                        [2196.24,2211.59,2180.67,2212.59],
-	                        [2215.47,2225.77,2215.47,2234.73],
-	                        [2224.93,2226.13,2212.56,2233.04],
-	                        [2236.98,2219.55,2217.26,2242.48],
-	                        [2218.09,2206.78,2204.44,2226.26],
-	                        [2199.91,2181.94,2177.39,2204.99],
-	                        [2169.63,2194.85,2165.78,2196.43],
-	                        [2195.03,2193.8,2178.47,2197.51],
-	                        [2181.82,2197.6,2175.44,2206.03],
-	                        [2201.12,2244.64,2200.58,2250.11],
-	                        [2236.4,2242.17,2232.26,2245.12],
-	                        [2242.62,2184.54,2182.81,2242.62],
-	                        [2187.35,2218.32,2184.11,2226.12],
-	                        [2213.19,2199.31,2191.85,2224.63],
-	                        [2203.89,2177.91,2173.86,2210.58],
-	                        [2170.78,2174.12,2161.14,2179.65],
-	                        [2179.05,2205.5,2179.05,2222.81],
-	                        [2212.5,2231.17,2212.5,2236.07],
-	                        [2227.86,2235.57,2219.44,2240.26],
-	                        [2242.39,2246.3,2235.42,2255.21],
-	                        [2246.96,2232.97,2221.38,2247.86],
-	                        [2228.82,2246.83,2225.81,2247.67],
-	                        [2247.68,2241.92,2231.36,2250.85],
-	                        [2238.9,2217.01,2205.87,2239.93],
-	                        [2217.09,2224.8,2213.58,2225.19],
-	                        [2221.34,2251.81,2210.77,2252.87],
-	                        [2249.81,2282.87,2248.41,2288.09],
-	                        [2286.33,2299.99,2281.9,2309.39],
-	                        [2297.11,2305.11,2290.12,2305.3],
-	                        [2303.75,2302.4,2292.43,2314.18],
-	                        [2293.81,2275.67,2274.1,2304.95],
-	                        [2281.45,2288.53,2270.25,2292.59],
-	                        [2286.66,2293.08,2283.94,2301.7],
-	                        [2293.4,2321.32,2281.47,2322.1],
-	                        [2323.54,2324.02,2321.17,2334.33],
-	                        [2316.25,2317.75,2310.49,2325.72],
-	                        [2320.74,2300.59,2299.37,2325.53],
-	                        [2300.21,2299.25,2294.11,2313.43],
-	                        [2297.1,2272.42,2264.76,2297.1],
-	                        [2270.71,2270.93,2260.87,2276.86],
-	                        [2264.43,2242.11,2240.07,2266.69],
-	                        [2242.26,2210.9,2205.07,2250.63],
-	                        [2190.1,2148.35,2126.22,2190.1]
-	                    ]
-	                }
-	            ]
-	        };
-	        kChart.setOption(koption);
-	        $(window).resize(kChart.resize);
-	
-	        var pieChart = echarts.init(document.getElementById("echarts-pie-chart"));
-	        var pieoption = {
-	            title : {
-	                text: '某站点用户访问来源',
-	                subtext: '纯属虚构',
-	                x:'center'
-	            },
-	            tooltip : {
-	                trigger: 'item',
-	                formatter: "{a} <br/>{b} : {c} ({d}%)"
-	            },
-	            legend: {
-	                orient : 'vertical',
-	                x : 'left',
-	                data:['直接访问','邮件营销','联盟广告','视频广告','搜索引擎']
-	            },
-	            calculable : true,
-	            series : [
-	                {
-	                    name:'访问来源',
-	                    type:'pie',
-	                    radius : '55%',
-	                    center: ['50%', '60%'],
-	                    data:[
-	                        {value:335, name:'直接访问'},
-	                        {value:310, name:'邮件营销'},
-	                        {value:234, name:'联盟广告'},
-	                        {value:135, name:'视频广告'},
-	                        {value:1548, name:'搜索引擎'}
-	                    ]
-	                }
-	            ]
-	        };
-	        pieChart.setOption(pieoption);
-	        $(window).resize(pieChart.resize);
-	
-	        var radarChart = echarts.init(document.getElementById("echarts-radar-chart"));
-	        var radaroption = {
-	            title : {
-	                text: '预算 vs 开销',
-	                subtext: '纯属虚构'
-	            },
-	            tooltip : {
-	                trigger: 'axis'
-	            },
-	            legend: {
-	                orient : 'vertical',
-	                x : 'right',
-	                y : 'bottom',
-	                data:['预算分配','实际开销']
-	            },
-	            polar : [
-	               {
-	                   indicator : [
-	                       { text: '销售', max: 6000},
-	                       { text: '管理', max: 16000},
-	                       { text: '信息技术', max: 30000},
-	                       { text: '客服', max: 38000},
-	                       { text: '研发', max: 52000},
-	                       { text: '市场', max: 25000}
-	                    ]
-	                }
-	            ],
-	            calculable : true,
-	            series : [
-	                {
-	                    name: '预算 vs 开销',
-	                    type: 'radar',
-	                    data : [
-	                        {
-	                            value : [4300, 10000, 28000, 35000, 50000, 19000],
-	                            name : '预算分配'
-	                        },
-	                         {
-	                            value : [5000, 14000, 28000, 31000, 42000, 21000],
-	                            name : '实际开销'
-	                        }
-	                    ]
-	                }
-	            ]
-	        };
-	
-	        radarChart.setOption(radaroption);
-	        $(window).resize(radarChart.resize);
-	
-	        var mapChart = echarts.init(document.getElementById("echarts-map-chart"));
-	        var mapoption = {
-	            title : {
-	                text: 'iphone销量',
-	                subtext: '纯属虚构',
-	                x:'center'
-	            },
-	            tooltip : {
-	                trigger: 'item'
-	            },
-	            legend: {
-	                orient: 'vertical',
-	                x:'left',
-	                data:['iphone3','iphone4','iphone5']
-	            },
-	            dataRange: {
-	                min: 0,
-	                max: 2500,
-	                x: 'left',
-	                y: 'bottom',
-	                text:['高','低'],           // 文本，默认为数值文本
-	                calculable : true
-	            },
-	            toolbox: {
-	                show: true,
-	                orient : 'vertical',
-	                x: 'right',
-	                y: 'center',
-	                feature : {
-	                    mark : {show: true},
-	                    dataView : {show: true, readOnly: false},
-	                    restore : {show: true},
-	                    saveAsImage : {show: true}
-	                }
-	            },
-	            roamController: {
-	                show: true,
-	                x: 'right',
-	                mapTypeControl: {
-	                    'china': true
-	                }
-	            },
-	            series : [
-	                {
-	                    name: 'iphone3',
-	                    type: 'map',
-	                    mapType: 'china',
-	                    roam: false,
-	                    itemStyle:{
-	                        normal:{label:{show:true}},
-	                        emphasis:{label:{show:true}}
-	                    },
-	                    data:[
-	                        {name: '北京',value: Math.round(Math.random()*1000)},
-	                        {name: '天津',value: Math.round(Math.random()*1000)},
-	                        {name: '上海',value: Math.round(Math.random()*1000)},
-	                        {name: '重庆',value: Math.round(Math.random()*1000)},
-	                        {name: '河北',value: Math.round(Math.random()*1000)},
-	                        {name: '河南',value: Math.round(Math.random()*1000)},
-	                        {name: '云南',value: Math.round(Math.random()*1000)},
-	                        {name: '辽宁',value: Math.round(Math.random()*1000)},
-	                        {name: '黑龙江',value: Math.round(Math.random()*1000)},
-	                        {name: '湖南',value: Math.round(Math.random()*1000)},
-	                        {name: '安徽',value: Math.round(Math.random()*1000)},
-	                        {name: '山东',value: Math.round(Math.random()*1000)},
-	                        {name: '新疆',value: Math.round(Math.random()*1000)},
-	                        {name: '江苏',value: Math.round(Math.random()*1000)},
-	                        {name: '浙江',value: Math.round(Math.random()*1000)},
-	                        {name: '江西',value: Math.round(Math.random()*1000)},
-	                        {name: '湖北',value: Math.round(Math.random()*1000)},
-	                        {name: '广西',value: Math.round(Math.random()*1000)},
-	                        {name: '甘肃',value: Math.round(Math.random()*1000)},
-	                        {name: '山西',value: Math.round(Math.random()*1000)},
-	                        {name: '内蒙古',value: Math.round(Math.random()*1000)},
-	                        {name: '陕西',value: Math.round(Math.random()*1000)},
-	                        {name: '吉林',value: Math.round(Math.random()*1000)},
-	                        {name: '福建',value: Math.round(Math.random()*1000)},
-	                        {name: '贵州',value: Math.round(Math.random()*1000)},
-	                        {name: '广东',value: Math.round(Math.random()*1000)},
-	                        {name: '青海',value: Math.round(Math.random()*1000)},
-	                        {name: '西藏',value: Math.round(Math.random()*1000)},
-	                        {name: '四川',value: Math.round(Math.random()*1000)},
-	                        {name: '宁夏',value: Math.round(Math.random()*1000)},
-	                        {name: '海南',value: Math.round(Math.random()*1000)},
-	                        {name: '台湾',value: Math.round(Math.random()*1000)},
-	                        {name: '香港',value: Math.round(Math.random()*1000)},
-	                        {name: '澳门',value: Math.round(Math.random()*1000)}
-	                    ]
-	                },
-	                {
-	                    name: 'iphone4',
-	                    type: 'map',
-	                    mapType: 'china',
-	                    itemStyle:{
-	                        normal:{label:{show:true}},
-	                        emphasis:{label:{show:true}}
-	                    },
-	                    data:[
-	                        {name: '北京',value: Math.round(Math.random()*1000)},
-	                        {name: '天津',value: Math.round(Math.random()*1000)},
-	                        {name: '上海',value: Math.round(Math.random()*1000)},
-	                        {name: '重庆',value: Math.round(Math.random()*1000)},
-	                        {name: '河北',value: Math.round(Math.random()*1000)},
-	                        {name: '安徽',value: Math.round(Math.random()*1000)},
-	                        {name: '新疆',value: Math.round(Math.random()*1000)},
-	                        {name: '浙江',value: Math.round(Math.random()*1000)},
-	                        {name: '江西',value: Math.round(Math.random()*1000)},
-	                        {name: '山西',value: Math.round(Math.random()*1000)},
-	                        {name: '内蒙古',value: Math.round(Math.random()*1000)},
-	                        {name: '吉林',value: Math.round(Math.random()*1000)},
-	                        {name: '福建',value: Math.round(Math.random()*1000)},
-	                        {name: '广东',value: Math.round(Math.random()*1000)},
-	                        {name: '西藏',value: Math.round(Math.random()*1000)},
-	                        {name: '四川',value: Math.round(Math.random()*1000)},
-	                        {name: '宁夏',value: Math.round(Math.random()*1000)},
-	                        {name: '香港',value: Math.round(Math.random()*1000)},
-	                        {name: '澳门',value: Math.round(Math.random()*1000)}
-	                    ]
-	                },
-	                {
-	                    name: 'iphone5',
-	                    type: 'map',
-	                    mapType: 'china',
-	                    itemStyle:{
-	                        normal:{label:{show:true}},
-	                        emphasis:{label:{show:true}}
-	                    },
-	                    data:[
-	                        {name: '北京',value: Math.round(Math.random()*1000)},
-	                        {name: '天津',value: Math.round(Math.random()*1000)},
-	                        {name: '上海',value: Math.round(Math.random()*1000)},
-	                        {name: '广东',value: Math.round(Math.random()*1000)},
-	                        {name: '台湾',value: Math.round(Math.random()*1000)},
-	                        {name: '香港',value: Math.round(Math.random()*1000)},
-	                        {name: '澳门',value: Math.round(Math.random()*1000)}
-	                    ]
-	                }
-	            ]
-	        };
-	        mapChart.setOption(mapoption);
-	        $(window).resize(mapChart.resize);
-	
-	        var chordChart = echarts.init(document.getElementById("echarts-chord-chart"));
-	        var chordoption = {
-	            title : {
-	                text: '测试数据',
-	                subtext: 'From d3.js',
-	                x:'right',
-	                y:'bottom'
-	            },
-	            tooltip : {
-	                trigger: 'item',
-	                formatter: function (params) {
-	                    if (params.indicator2) { // is edge
-	                        return params.value.weight;
-	                    } else {// is node
-	                        return params.name
-	                    }
-	                }
-	            },
-	            toolbox: {
-	                show : true,
-	                feature : {
-	                    restore : {show: true},
-	                    magicType: {show: true, type: ['force', 'chord']},
-	                    saveAsImage : {show: true}
-	                }
-	            },
-	            legend: {
-	                x: 'left',
-	                data:['group1','group2', 'group3', 'group4']
-	            },
-	            series : [
-	                {
-	                    type:'chord',
-	                    sort : 'ascending',
-	                    sortSub : 'descending',
-	                    showScale : true,
-	                    showScaleText : true,
-	                    data : [
-	                        {name : 'group1'},
-	                        {name : 'group2'},
-	                        {name : 'group3'},
-	                        {name : 'group4'}
-	                    ],
-	                    itemStyle : {
-	                        normal : {
-	                            label : {
-	                                show : false
-	                            }
-	                        }
-	                    },
-	                    matrix : [
-	                        [11975,  5871, 8916, 2868],
-	                        [ 1951, 10048, 2060, 6171],
-	                        [ 8010, 16145, 8090, 8045],
-	                        [ 1013,   990,  940, 6907]
-	                    ]
-	                }
-	            ]
-	        };
-	
-	        chordChart.setOption(chordoption);
-	        $(window).resize(chordChart.resize);
-	
-	        var forceChart = echarts.init(document.getElementById("echarts-force-chart"));
-	        var forceoption ={
-	            title : {
-	                text: '人物关系：乔布斯',
-	                subtext: '数据来自人立方',
-	                x:'right',
-	                y:'bottom'
-	            },
-	            tooltip : {
-	                trigger: 'item',
-	                formatter: '{a} : {b}'
-	            },
-	            toolbox: {
-	                show : true,
-	                feature : {
-	                    restore : {show: true},
-	                    magicType: {show: true, type: ['force', 'chord']},
-	                    saveAsImage : {show: true}
-	                }
-	            },
-	            legend: {
-	                x: 'left',
-	                data:['家人','朋友']
-	            },
-	            series : [
-	                {
-	                    type:'force',
-	                    name : "人物关系",
-	                    ribbonType: false,
-	                    categories : [
-	                        {
-	                            name: '人物'
-	                        },
-	                        {
-	                            name: '家人'
-	                        },
-	                        {
-	                            name:'朋友'
-	                        }
-	                    ],
-	                    itemStyle: {
-	                        normal: {
-	                            label: {
-	                                show: true,
-	                                textStyle: {
-	                                    color: '#333'
-	                                }
-	                            },
-	                            nodeStyle : {
-	                                brushType : 'both',
-	                                borderColor : 'rgba(255,215,0,0.4)',
-	                                borderWidth : 1
-	                            },
-	                            linkStyle: {
-	                                type: 'curve'
-	                            }
-	                        },
-	                        emphasis: {
-	                            label: {
-	                                show: false
-	                                // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
-	                            },
-	                            nodeStyle : {
-	                                //r: 30
-	                            },
-	                            linkStyle : {}
-	                        }
-	                    },
-	                    useWorker: false,
-	                    minRadius : 15,
-	                    maxRadius : 25,
-	                    gravity: 1.1,
-	                    scaling: 1.1,
-	                    roam: 'move',
-	                    nodes:[
-	                        {category:0, name: '乔布斯', value : 10},
-	                        {category:1, name: '丽萨-乔布斯',value : 2},
-	                        {category:1, name: '保罗-乔布斯',value : 3},
-	                        {category:1, name: '克拉拉-乔布斯',value : 3},
-	                        {category:1, name: '劳伦-鲍威尔',value : 7},
-	                        {category:2, name: '史蒂夫-沃兹尼艾克',value : 5},
-	                        {category:2, name: '奥巴马',value : 8},
-	                        {category:2, name: '比尔-盖茨',value : 9},
-	                        {category:2, name: '乔纳森-艾夫',value : 4},
-	                        {category:2, name: '蒂姆-库克',value : 4},
-	                        {category:2, name: '龙-韦恩',value : 1},
-	                    ],
-	                    links : [
-	                        {source : '丽萨-乔布斯', target : '乔布斯', weight : 1, name: '女儿'},
-	                        {source : '保罗-乔布斯', target : '乔布斯', weight : 2, name: '父亲'},
-	                        {source : '克拉拉-乔布斯', target : '乔布斯', weight : 1, name: '母亲'},
-	                        {source : '劳伦-鲍威尔', target : '乔布斯', weight : 2},
-	                        {source : '史蒂夫-沃兹尼艾克', target : '乔布斯', weight : 3, name: '合伙人'},
-	                        {source : '奥巴马', target : '乔布斯', weight : 1},
-	                        {source : '比尔-盖茨', target : '乔布斯', weight : 6, name: '竞争对手'},
-	                        {source : '乔纳森-艾夫', target : '乔布斯', weight : 1, name: '爱将'},
-	                        {source : '蒂姆-库克', target : '乔布斯', weight : 1},
-	                        {source : '龙-韦恩', target : '乔布斯', weight : 1},
-	                        {source : '克拉拉-乔布斯', target : '保罗-乔布斯', weight : 1},
-	                        {source : '奥巴马', target : '保罗-乔布斯', weight : 1},
-	                        {source : '奥巴马', target : '克拉拉-乔布斯', weight : 1},
-	                        {source : '奥巴马', target : '劳伦-鲍威尔', weight : 1},
-	                        {source : '奥巴马', target : '史蒂夫-沃兹尼艾克', weight : 1},
-	                        {source : '比尔-盖茨', target : '奥巴马', weight : 6},
-	                        {source : '比尔-盖茨', target : '克拉拉-乔布斯', weight : 1},
-	                        {source : '蒂姆-库克', target : '奥巴马', weight : 1}
-	                    ]
-	                }
-	            ]
-	        };
-	        forceChart.setOption(forceoption);
-	        $(window).resize(forceChart.resize);
-	
-	        var gaugeChart = echarts.init(document.getElementById("echarts-gauge-chart"));
-	        var gaugeoption = {
-	            tooltip : {
-	                formatter: "{a} <br/>{c} {b}"
-	            },
-	            toolbox: {
-	                show : true,
-	                feature : {
-	                    mark : {show: true},
-	                    restore : {show: true},
-	                    saveAsImage : {show: true}
-	                }
-	            },
-	            series : [
-	                {
-	                    name:'速度',
-	                    type:'gauge',
-	                    min:0,
-	                    max:220,
-	                    splitNumber:11,
-	                    axisLine: {            // 坐标轴线
-	                        lineStyle: {       // 属性lineStyle控制线条样式
-	                            width: 10
-	                        }
-	                    },
-	                    axisTick: {            // 坐标轴小标记
-	                        length :15,        // 属性length控制线长
-	                        lineStyle: {       // 属性lineStyle控制线条样式
-	                            color: 'auto'
-	                        }
-	                    },
-	                    splitLine: {           // 分隔线
-	                        length :20,         // 属性length控制线长
-	                        lineStyle: {       // 属性lineStyle（详见lineStyle）控制线条样式
-	                            color: 'auto'
-	                        }
-	                    },
-	                    title : {
-	                        textStyle: {       // 其余属性默认使用全局文本样式，详见TEXTSTYLE
-	                            fontWeight: 'bolder',
-	                            fontSize: 20,
-	                            fontStyle: 'italic'
-	                        }
-	                    },
-	                    detail : {
-	                        textStyle: {       // 其余属性默认使用全局文本样式，详见TEXTSTYLE
-	                            fontWeight: 'bolder'
-	                        }
-	                    },
-	                    data:[{value: 40, name: 'km/h'}]
-	                },
-	                {
-	                    name:'转速',
-	                    type:'gauge',
-	                    center : ['25%', '55%'],    // 默认全局居中
-	                    radius : '50%',
-	                    min:0,
-	                    max:7,
-	                    endAngle:45,
-	                    splitNumber:7,
-	                    axisLine: {            // 坐标轴线
-	                        lineStyle: {       // 属性lineStyle控制线条样式
-	                            width: 8
-	                        }
-	                    },
-	                    axisTick: {            // 坐标轴小标记
-	                        length :12,        // 属性length控制线长
-	                        lineStyle: {       // 属性lineStyle控制线条样式
-	                            color: 'auto'
-	                        }
-	                    },
-	                    splitLine: {           // 分隔线
-	                        length :20,         // 属性length控制线长
-	                        lineStyle: {       // 属性lineStyle（详见lineStyle）控制线条样式
-	                            color: 'auto'
-	                        }
-	                    },
-	                    pointer: {
-	                        width:5
-	                    },
-	                    title : {
-	                        offsetCenter: [0, '-30%'],       // x, y，单位px
-	                    },
-	                    detail : {
-	                        textStyle: {       // 其余属性默认使用全局文本样式，详见TEXTSTYLE
-	                            fontWeight: 'bolder'
-	                        }
-	                    },
-	                    data:[{value: 1.5, name: 'x1000 r/min'}]
-	                },
-	                {
-	                    name:'油表',
-	                    type:'gauge',
-	                    center : ['75%', '50%'],    // 默认全局居中
-	                    radius : '50%',
-	                    min:0,
-	                    max:2,
-	                    startAngle:135,
-	                    endAngle:45,
-	                    splitNumber:2,
-	                    axisLine: {            // 坐标轴线
-	                        lineStyle: {       // 属性lineStyle控制线条样式
-	                            color: [
-	                                     [0.2, '#ff4500'],[0.8, '#48b'],[1, '#228b22']
-	                                   ],
-	                            width: 8
-	                        }
-	                    },
-	                    axisTick: {            // 坐标轴小标记
-	                        splitNumber:5,
-	                        length :10,        // 属性length控制线长
-	                        lineStyle: {       // 属性lineStyle控制线条样式
-	                            color: 'auto'
-	                        }
-	                    },
-	                    axisLabel: {
-	                        formatter:function(v){
-	                            switch (v + '') {
-	                                case '0' : return 'E';
-	                                case '1' : return 'Gas';
-	                                case '2' : return 'F';
-	                            }
-	                        }
-	                    },
-	                    splitLine: {           // 分隔线
-	                        length :15,         // 属性length控制线长
-	                        lineStyle: {       // 属性lineStyle（详见lineStyle）控制线条样式
-	                            color: 'auto'
-	                        }
-	                    },
-	                    pointer: {
-	                        width:2
-	                    },
-	                    title : {
-	                        show: false
-	                    },
-	                    detail : {
-	                        show: false
-	                    },
-	                    data:[{value: 0.5, name: 'gas'}]
-	                },
-	                {
-	                    name:'水表',
-	                    type:'gauge',
-	                    center : ['75%', '50%'],    // 默认全局居中
-	                    radius : '50%',
-	                    min:0,
-	                    max:2,
-	                    startAngle:315,
-	                    endAngle:225,
-	                    splitNumber:2,
-	                    axisLine: {            // 坐标轴线
-	                        lineStyle: {       // 属性lineStyle控制线条样式
-	                            color: [
-	                                     [0.2, '#ff4500'],[0.8, '#48b'],[1, '#228b22']
-	                                   ],
-	                            width: 8
-	                        }
-	                    },
-	                    axisTick: {            // 坐标轴小标记
-	                        show: false
-	                    },
-	                    axisLabel: {
-	                        formatter:function(v){
-	                            switch (v + '') {
-	                                case '0' : return 'H';
-	                                case '1' : return 'Water';
-	                                case '2' : return 'C';
-	                            }
-	                        }
-	                    },
-	                    splitLine: {           // 分隔线
-	                        length :15,         // 属性length控制线长
-	                        lineStyle: {       // 属性lineStyle（详见lineStyle）控制线条样式
-	                            color: 'auto'
-	                        }
-	                    },
-	                    pointer: {
-	                        width:2
-	                    },
-	                    title : {
-	                        show: false
-	                    },
-	                    detail : {
-	                        show: false
-	                    },
-	                    data:[{value: 0.5, name: 'gas'}]
-	                }
-	            ]
-	        };
-	        gaugeChart.setOption(gaugeoption);
-	        $(window).resize(gaugeChart.resize);
-	
-	        var funnelChart = echarts.init(document.getElementById("echarts-funnel-chart"));
-	        var funneloption = {
-	            title : {
-	                text: '漏斗图',
-	                subtext: '纯属虚构'
-	            },
-	            tooltip : {
-	                trigger: 'item',
-	                formatter: "{a} <br/>{b} : {c}%"
-	            },
-	            legend: {
-	                data : ['展现','点击','访问','咨询','订单']
-	            },
-	            calculable : true,
-	            series : [
-	                {
-	                    name:'漏斗图',
-	                    type:'funnel',
-	                    width: '40%',
-	                    data:[
-	                        {value:60, name:'访问'},
-	                        {value:40, name:'咨询'},
-	                        {value:20, name:'订单'},
-	                        {value:80, name:'点击'},
-	                        {value:100, name:'展现'}
-	                    ]
-	                },
-	                {
-	                    name:'金字塔',
-	                    type:'funnel',
-	                    x : '50%',
-	                    sort : 'ascending',
-	                    itemStyle: {
-	                        normal: {
-	                            // color: 各异,
-	                            label: {
-	                                position: 'left'
-	                            }
-	                        }
-	                    },
-	                    data:[
-	                        {value:60, name:'访问'},
-	                        {value:40, name:'咨询'},
-	                        {value:20, name:'订单'},
-	                        {value:80, name:'点击'},
-	                        {value:100, name:'展现'}
-	                    ]
-	                }
-	            ]
-	        };
-	
-	        funnelChart.setOption(funneloption);
-	        $(window).resize(funnelChart.resize);
-	
-	    });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/report/metrics.html b/ruoyi-admin/src/main/resources/templates/demo/report/metrics.html
deleted file mode 100644
index 6493eed7a..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/report/metrics.html
+++ /dev/null
@@ -1,478 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('图表组合')" />
-</head>
-<body class="gray-bg">
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5 class="m-b-md">Q1 销量</h5>
-                        <h2 class="text-navy">
-                                    <i class="fa fa-play fa-rotate-270"></i> 上升
-                                </h2>
-                        <small>更新时间：12天以前</small>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content ">
-                        <h5 class="m-b-md">Q2 销量</h5>
-                        <h2 class="text-navy">
-                                    <i class="fa fa-play fa-rotate-270"></i> 上升
-                                </h2>
-                        <small>更新时间：12天以前</small>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5 class="m-b-md">Q3 销量</h5>
-                        <h2 class="text-danger">
-                                    <i class="fa fa-play fa-rotate-90"></i> 下降
-                                </h2>
-                        <small>更新时间：12天以前</small>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5 class="m-b-md">Q4 销量</h5>
-                        <h2 class="text-danger">
-                                    <i class="fa fa-play fa-rotate-90"></i> 下降
-                                </h2>
-                        <small>更新时间：12天以前</small>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div class="row">
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>本日访问量</h5>
-                        <h2>198 009</h2>
-                        <div id="sparkline1"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>本周访问量</h5>
-                        <h2>65 000</h2>
-                        <div id="sparkline2"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>本月访问量</h5>
-                        <h2>680 900</h2>
-                        <div id="sparkline3"></div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>平均停留时间</h5>
-                        <h2>00:06:40</h2>
-                        <div id="sparkline4"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>使用率</h5>
-                        <h2>65%</h2>
-                        <div class="progress progress-mini">
-                            <div style="width: 68%;" class="progress-bar"></div>
-                        </div>
-
-                        <div class="m-t-sm small">4:32更新</div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>使用率</h5>
-                        <h2>50%</h2>
-                        <div class="progress progress-mini">
-                            <div style="width: 78%;" class="progress-bar"></div>
-                        </div>
-
-                        <div class="m-t-sm small">4:32更新</div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>使用率</h5>
-                        <h2>14%</h2>
-                        <div class="progress progress-mini">
-                            <div style="width: 38%;" class="progress-bar progress-bar-danger"></div>
-                        </div>
-
-                        <div class="m-t-sm small">4:32更新</div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>使用率</h5>
-                        <h2>20%</h2>
-                        <div class="progress progress-mini">
-                            <div style="width: 28%;" class="progress-bar progress-bar-danger"></div>
-                        </div>
-
-                        <div class="m-t-sm small">4:32更新</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>百分比</h5>
-                        <h2>42/20</h2>
-                        <div class="text-center">
-                            <div id="sparkline5"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>百分比</h5>
-                        <h2>100/54</h2>
-                        <div class="text-center">
-                            <div id="sparkline6"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>百分比</h5>
-                        <h2>685/211</h2>
-                        <div class="text-center">
-                            <div id="sparkline7"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>百分比</h5>
-                        <h2>240/32</h2>
-                        <div class="text-center">
-                            <div id="sparkline8"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>收入</h5>
-                        <h1 class="no-margins">886,200</h1>
-                        <div class="stat-percent font-bold text-navy">98% <i class="fa fa-bolt"></i></div>
-                        <small>总收入</small>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>本月收入</h5>
-                        <h1 class="no-margins">1 738,200</h1>
-                        <div class="stat-percent font-bold text-navy">98% <i class="fa fa-bolt"></i></div>
-                        <small>总收入</small>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>本日收入</h5>
-                        <h1 class="no-margins">-200,100</h1>
-                        <div class="stat-percent font-bold text-danger">12% <i class="fa fa-level-down"></i></div>
-                        <small>总收入</small>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>搜索有收入</h5>
-                        <h1 class="no-margins">54,200</h1>
-                        <div class="stat-percent font-bold text-danger">24% <i class="fa fa-level-down"></i></div>
-                        <small>总收入</small>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>预警</h5>
-                        <table class="table table-stripped small m-t-md">
-                            <tbody>
-                                <tr>
-                                    <td class="no-borders">
-                                        <i class="fa fa-circle text-navy"></i>
-                                    </td>
-                                    <td class="no-borders">
-                                        示例 01
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <i class="fa fa-circle text-navy"></i>
-                                    </td>
-                                    <td>
-                                        示例 02
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <i class="fa fa-circle text-navy"></i>
-                                    </td>
-                                    <td>
-                                        示例 03
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>项目</h5>
-                        <table class="table table-stripped small m-t-md">
-                            <tbody>
-                                <tr>
-                                    <td class="no-borders">
-                                        <i class="fa fa-circle text-navy"></i>
-                                    </td>
-                                    <td class="no-borders">
-                                        示例 01
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <i class="fa fa-circle text-navy"></i>
-                                    </td>
-                                    <td>
-                                        示例 02
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <i class="fa fa-circle text-navy"></i>
-                                    </td>
-                                    <td>
-                                        示例 03
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>消息</h5>
-                        <table class="table table-stripped small m-t-md">
-                            <tbody>
-                                <tr>
-                                    <td class="no-borders">
-                                        <i class="fa fa-circle text-danger"></i>
-                                    </td>
-                                    <td class="no-borders">
-                                        示例 01
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <i class="fa fa-circle text-danger"></i>
-                                    </td>
-                                    <td>
-                                        示例 02
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <i class="fa fa-circle text-danger"></i>
-                                    </td>
-                                    <td>
-                                        示例 03
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="ibox">
-                    <div class="ibox-content">
-                        <h5>通知</h5>
-                        <table class="table table-stripped small m-t-md">
-                            <tbody>
-                                <tr>
-                                    <td class="no-borders">
-                                        <i class="fa fa-circle text-danger"></i>
-                                    </td>
-                                    <td class="no-borders">
-                                        示例 01
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <i class="fa fa-circle text-danger"></i>
-                                    </td>
-                                    <td>
-                                        示例 02
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <i class="fa fa-circle text-danger"></i>
-                                    </td>
-                                    <td>
-                                        示例 03
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: peity-js" />
-    <th:block th:include="include :: sparkline-js" />
-    <script type="text/javascript">
-	    $(document).ready(function () {
-	        $("#sparkline1").sparkline([34, 43, 43, 35, 44, 32, 44, 52], {
-	            type: 'line',
-	            width: '100%',
-	            height: '60',
-	            lineColor: '#1ab394',
-	            fillColor: "#ffffff"
-	        });
-	
-	        $("#sparkline2").sparkline([24, 43, 43, 55, 44, 62, 44, 72], {
-	            type: 'line',
-	            width: '100%',
-	            height: '60',
-	            lineColor: '#1ab394',
-	            fillColor: "#ffffff"
-	        });
-	
-	        $("#sparkline3").sparkline([74, 43, 23, 55, 54, 32, 24, 12], {
-	            type: 'line',
-	            width: '100%',
-	            height: '60',
-	            lineColor: '#ed5565',
-	            fillColor: "#ffffff"
-	        });
-	
-	        $("#sparkline4").sparkline([24, 43, 33, 55, 64, 72, 44, 22], {
-	            type: 'line',
-	            width: '100%',
-	            height: '60',
-	            lineColor: '#ed5565',
-	            fillColor: "#ffffff"
-	        });
-	
-	        $("#sparkline5").sparkline([1, 4], {
-	            type: 'pie',
-	            height: '140',
-	            sliceColors: ['#1ab394', '#F5F5F5']
-	        });
-	
-	        $("#sparkline6").sparkline([5, 3], {
-	            type: 'pie',
-	            height: '140',
-	            sliceColors: ['#1ab394', '#F5F5F5']
-	        });
-	
-	        $("#sparkline7").sparkline([2, 2], {
-	            type: 'pie',
-	            height: '140',
-	            sliceColors: ['#ed5565', '#F5F5F5']
-	        });
-	
-	        $("#sparkline8").sparkline([2, 3], {
-	            type: 'pie',
-	            height: '140',
-	            sliceColors: ['#ed5565', '#F5F5F5']
-	        });
-	    });
-	    
-	    $(function() {
-	        $("span.pie").peity("pie", {
-	            fill: ['#1ab394', '#d7d7d7', '#ffffff']
-	        })
-	
-	        $(".line").peity("line",{
-	            fill: '#1ab394',
-	            stroke:'#169c81',
-	        })
-	
-	        $(".bar").peity("bar", {
-	            fill: ["#1ab394", "#d7d7d7"]
-	        })
-	
-	        $(".bar_dashboard").peity("bar", {
-	            fill: ["#1ab394", "#d7d7d7"],
-	            width:100
-	        })
-	
-	        var updatingChart = $(".updating-chart").peity("line", { fill: '#1ab394',stroke:'#169c81', width: 64 })
-	
-	        setInterval(function() {
-	            var random = Math.round(Math.random() * 10)
-	            var values = updatingChart.text().split(",")
-	            values.shift()
-	            values.push(random)
-	
-	            updatingChart
-	                .text(values.join(","))
-	                .change()
-	        }, 1000);
-	    });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/report/peity.html b/ruoyi-admin/src/main/resources/templates/demo/report/peity.html
deleted file mode 100644
index 4ebbc17c8..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/report/peity.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('图表')" />
-</head>
-<body class="gray-bg">
-    <div class="wrapper wrapper-content animated fadeInDown">
-
-        <div class="row">
-            <div class="col-sm-5">
-                <div class="jumbotron">
-                    <h1>Peity图表</h1>
-                    <p>是一个内嵌数据图形可视化的图表库</p>
-                    <p><a href="http://benpickles.github.io/peity/" target="_blank" class="btn btn-primary btn-lg" role="button">了解 Peity</a>
-                    </p>
-                </div>
-            </div>
-            <div class="col-sm-7">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>饼状图 <small>自定义颜色</small></h5>
-                        <div class="ibox-tools">
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div>
-                        <table class="table table-bordered white-bg">
-                            <thead>
-                                <tr>
-                                    <th>图表</th>
-                                    <th>代码</th>
-                                </tr>
-                            </thead>
-
-                            <tbody>
-                                <tr>
-                                    <td>
-                                        <span class="pie">1/5</span>
-                                    </td>
-                                    <td>
-                                        <code>&lt;span class="pie"&gt;1/5&lt;/span&gt;</code>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span class="pie">226/360</span>
-                                    </td>
-                                    <td>
-                                        <code>&lt;span class="pie"&gt;226/360&lt;/span&gt;</code>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span class="pie">0.52/1.561</span>
-                                    </td>
-                                    <td>
-                                        <code>&lt;span class="pie"&gt;0.52/1.561&lt;/span&gt;</code>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span class="pie">1,4</span>
-                                    </td>
-                                    <td>
-                                        <code>&lt;span class="pie"&gt;1,4&lt;/span&gt;</code>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span class="pie">226,134</span>
-                                    </td>
-                                    <td>
-                                        <code>&lt;span class="pie"&gt;226,134&lt;/span&gt;</code>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span class="pie">0.52,1.041</span>
-                                    </td>
-                                    <td>
-                                        <code>&lt;span class="pie"&gt;0.52,1.041&lt;/span&gt;</code>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>线性图</h5>
-                        <div class="ibox-tools">
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div>
-                        <table class="table table-bordered white-bg">
-                            <thead>
-                                <tr>
-                                    <th>图表</th>
-                                    <th>代码</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>
-                                        <span data-diameter="40" class="updating-chart">5,3,9,6,5,9,7,3,5,2,5,3,9,6,5,9,7,3,5,2</span>
-                                    </td>
-                                    <td>
-                                        <code>&lt;span class="line"&gt;5,3,9,6,5,9,7,3,5,2&lt;/span&gt;</code>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span class="line">5,3,9,6,5,9,7,3,5,2</span>
-                                    </td>
-                                    <td>
-                                        <code>&lt;span class="line"&gt;5,3,9,6,5,9,7,3,5,2&lt;/span&gt;</code>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span class="line">5,3,2,-1,-3,-2,2,3,5,2</span>
-                                    </td>
-                                    <td>
-                                        <code>&lt;span class="line"&gt;5,3,2,-1,-3,-2,2,3,5,2&lt;/span&gt;</code>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span class="line">0,-3,-6,-4,-5,-4,-7,-3,-5,-2</span>
-                                    </td>
-                                    <td>
-                                        <code>&lt;span class="line"&gt;0,-3,-6,-4,-5,-4,-7,-3,-5,-2&lt;/span&gt;</code>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span class="bar">5,3,9,6,5,9,7,3,5,2</span>
-                                    </td>
-                                    <td>
-                                        <code>&lt;span class="bar"&gt;5,3,9,6,5,9,7,3,5,2&lt;/span&gt;</code>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span class="bar">5,3,2,-1,-3,-2,2,3,5,2</span>
-                                    </td>
-                                    <td>
-                                        <code>&lt;span class="bar"&gt;5,3,2,-1,-3,-2,2,3,5,2&lt;/span&gt;</code>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: peity-js" />
-    <script type="text/javascript">
-	    $(function() {
-	        $("span.pie").peity("pie", {
-	            fill: ['#1ab394', '#d7d7d7', '#ffffff']
-	        })
-	
-	        $(".line").peity("line",{
-	            fill: '#1ab394',
-	            stroke:'#169c81',
-	        })
-	
-	        $(".bar").peity("bar", {
-	            fill: ["#1ab394", "#d7d7d7"]
-	        })
-	
-	        $(".bar_dashboard").peity("bar", {
-	            fill: ["#1ab394", "#d7d7d7"],
-	            width:100
-	        })
-	
-	        var updatingChart = $(".updating-chart").peity("line", { fill: '#1ab394',stroke:'#169c81', width: 64 })
-	
-	        setInterval(function() {
-	            var random = Math.round(Math.random() * 10)
-	            var values = updatingChart.text().split(",")
-	            values.shift()
-	            values.push(random)
-	
-	            updatingChart
-	                .text(values.join(","))
-	                .change()
-	        }, 1000);
-	
-	    });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/report/sparkline.html b/ruoyi-admin/src/main/resources/templates/demo/report/sparkline.html
deleted file mode 100644
index 5ed6f05b2..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/report/sparkline.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('线状图')" />
-</head>
-<body class="gray-bg">
-    <div class="wrapper wrapper-content animated fadeInDown">
-
-        <div class="row">
-            <div class="col-sm-5">
-                <div class="jumbotron">
-                    <h1>Sparkline</h1>
-                    <p>这是另一个可视化图表库</p>
-                    <p><a href="http://omnipotent.net/jquery.sparkline" target="_blank" class="btn btn-primary btn-lg" role="button">了解 Sparkline</a>
-                    </p>
-                </div>
-            </div>
-            <div class="col-sm-7">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>Sparkline图表 <small>自定义颜色</small></h5>
-                        <div class="ibox-tools">
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div>
-                        <table class="table table-bordered white-bg">
-                            <thead>
-                                <tr>
-                                    <th>图表</th>
-                                    <th>类型</th>
-                                </tr>
-                            </thead>
-
-                            <tbody>
-                                <tr>
-                                    <td>
-                                        <span id="sparkline1"></span>
-                                    </td>
-                                    <td>
-                                        内联线性图
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span id="sparkline2"></span>
-                                    </td>
-                                    <td>
-                                        柱状图
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span id="sparkline3"></span>
-                                    </td>
-                                    <td>
-                                        饼状图
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span id="sparkline4"></span>
-                                    </td>
-                                    <td>
-                                        长线性图
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span id="sparkline5"></span>
-                                    </td>
-                                    <td>
-                                        三态图
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <span id="sparkline6"></span>
-                                    </td>
-                                    <td>
-                                        散点图
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-4">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>自定义饼状图尺寸</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_sparkline.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_sparkline.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_sparkline.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content text-center h-200">
-                        <span id="sparkline7"></span>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-4">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>自定义柱状图尺寸</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_sparkline.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_sparkline.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_sparkline.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content text-center h-200">
-                        <span id="sparkline8"></span>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-4">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>自定义线性图尺寸</h5>
-                        <div class="ibox-tools">
-                            <a class="collapse-link">
-                                <i class="fa fa-chevron-up"></i>
-                            </a>
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="graph_sparkline.html#">
-                                <i class="fa fa-wrench"></i>
-                            </a>
-                            <ul class="dropdown-menu dropdown-user">
-                                <li><a href="graph_sparkline.html#">选项1</a>
-                                </li>
-                                <li><a href="graph_sparkline.html#">选项2</a>
-                                </li>
-                            </ul>
-                            <a class="close-link">
-                                <i class="fa fa-times"></i>
-                            </a>
-                        </div>
-                    </div>
-                    <div class="ibox-content text-center h-200">
-                        <span id="sparkline9"></span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: sparkline-js" />
-    <script type="text/javascript">
-	    $(function () {
-	        $("#sparkline1").sparkline([34, 43, 43, 35, 44, 32, 44, 52, 25], {
-	            type: 'line',
-	            lineColor: '#17997f',
-	            fillColor: '#1ab394',
-	        });
-	        $("#sparkline2").sparkline([5, 6, 7, 2, 0, -4, -2, 4], {
-	            type: 'bar',
-	            barColor: '#1ab394',
-	            negBarColor: '#c6c6c6'});
-	
-	        $("#sparkline3").sparkline([1, 1, 2], {
-	            type: 'pie',
-	            sliceColors: ['#1ab394', '#b3b3b3', '#e4f0fb']});
-	
-	        $("#sparkline4").sparkline([34, 43, 43, 35, 44, 32, 15, 22, 46, 33, 86, 54, 73, 53, 12, 53, 23, 65, 23, 63, 53, 42, 34, 56, 76, 15, 54, 23, 44], {
-	            type: 'line',
-	            lineColor: '#17997f',
-	            fillColor: '#ffffff',
-	        });
-	
-	        $("#sparkline5").sparkline([1, 1, 0, 1, -1, -1, 1, -1, 0, 0, 1, 1], {
-	            type: 'tristate',
-	            posBarColor: '#1ab394',
-	            negBarColor: '#bfbfbf'});
-	
-	
-	        $("#sparkline6").sparkline([4, 6, 7, 7, 4, 3, 2, 1, 4, 4, 5, 6, 3, 4, 5, 8, 7, 6, 9, 3, 2, 4, 1, 5, 6, 4, 3, 7, ], {
-	            type: 'discrete',
-	            lineColor: '#1ab394'});
-	
-	        $("#sparkline7").sparkline([52, 12, 44], {
-	            type: 'pie',
-	            height: '150px',
-	            sliceColors: ['#1ab394', '#b3b3b3', '#e4f0fb']});
-	
-	        $("#sparkline8").sparkline([5, 6, 7, 2, 0, 4, 2, 4, 5, 7, 2, 4, 12, 14, 4, 2, 14, 12, 7], {
-	            type: 'bar',
-	            barWidth: 8,
-	            height: '150px',
-	            barColor: '#1ab394',
-	            negBarColor: '#c6c6c6'});
-	
-	        $("#sparkline9").sparkline([34, 43, 43, 35, 44, 32, 15, 22, 46, 33, 86, 54, 73, 53, 12, 53, 23, 65, 23, 63, 53, 42, 34, 56, 76, 15, 54, 23, 44], {
-	            type: 'line',
-	            lineWidth: 1,
-	            height: '150px',
-	            lineColor: '#17997f',
-	            fillColor: '#ffffff',
-	        });
-	    });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/button.html b/ruoyi-admin/src/main/resources/templates/demo/table/button.html
deleted file mode 100644
index bd87d27c0..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/button.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('点击按钮加载表格')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 search-collapse">
-				<form id="ordinary-form">
-					<div class="select-list">
-						<ul>
-							<li>
-								用户名称：<input type="text" name="userName"/>
-							</li>
-							<li>
-								<a class="btn btn-primary btn-rounded btn-sm" onclick="query()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-							    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-							</li>
-						</ul>
-					</div>
-				</form>
-			</div>
-			
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        function query() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/detail.html b/ruoyi-admin/src/main/resources/templates/demo/table/detail.html
deleted file mode 100644
index a51c634be..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/detail.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('跳转至指定页')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-		        detailView: true,
-		        detailFormatter: detailFormatter,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-        
-        function detailFormatter(index, row) {
-        	var html = [];
-        	$.each(row, function(key, value) {
-        		html.push('<p><b>' + key + ':</b> ' + value + '</p>');
-        	});
-        	return html.join('');
-       	}
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/event.html b/ruoyi-admin/src/main/resources/templates/demo/table/event.html
deleted file mode 100644
index 89f7f2a86..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/event.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('自定义触发事件')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-			    <p class="select-title">自定义触发事件（点击某行/双击某行/单击某格/双击某格/服务器发送数据前触发/数据被加载时触发）</p>
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-		        onClickRow: onClickRow,
-		        onDblClickRow: onDblClickRow,
-		        onClickCell: onClickCell,
-		        onDblClickCell: onDblClickCell,
-		        responseHandler: responseHandler,
-		        onLoadSuccess: onLoadSuccess,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-        
-        function onClickRow(row, $element){
-        	alert("单击行userId：" + row.userId + " userName：" + row.userName);
-        }
-        
-        function onDblClickRow(row, $element){
-        	alert("双击行userId：" + row.userId + " userName：" + row.userName);
-        }
-        
-        function onClickCell(field, value, row, $element){
-        	alert("单击格name：" + field + " value：" + value);
-        }
-        
-        function onDblClickCell(field, value, row, $element){
-        	alert("双击格name：" + field + " value：" + value);
-        }
-        
-        function responseHandler(res){
-        	alert("请求获取数据后处理回调函数");
-        }
-        
-        function onLoadSuccess(data){
-        	alert("当所有数据被加载时触发");
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/export.html b/ruoyi-admin/src/main/resources/templates/demo/table/export.html
deleted file mode 100644
index 85ba38d30..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/export.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('导出')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-		        showExport: true,
-		        exportOptions: {
-		        	ignoreColumn: [0, 8]  //忽略第一列和最后一列
-		        },
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html b/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html
deleted file mode 100644
index 588635c58..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('冻结列')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="btn-group-sm" id="toolbar" role="group">
-				<a class="btn btn-success">
-	                <i class="fa fa-plus"></i> 新增
-	            </a>
-				<a class="btn btn-primary btn-edit disabled">
-		            <i class="fa fa-edit"></i> 修改
-		        </a>
-				<a class="btn btn-danger btn-del disabled">
-		            <i class="fa fa-remove"></i> 删除
-		        </a>
-	        </div>
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-		        fixedColumns: true,
-    		    fixedNumber: 3,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-				{
-				    field : 'userBalance',
-				    title : '测试1'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试2'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试3'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试4'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试5'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试6'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试7'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试8'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试9'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试10'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试11'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试12'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试13'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试14'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试15'
-				},
-				{
-				    field : 'userBalance',
-				    title : '测试16'
-				}]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/footer.html b/ruoyi-admin/src/main/resources/templates/demo/table/footer.html
deleted file mode 100644
index 225d12dae..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/footer.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('表格数据汇总')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showFooter: true,
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额',
-				    footerFormatter:function (value) {
-				    	var sumBalance = 0;
-				        for (var i in value) {
-				        	sumBalance += parseFloat(value[i].userBalance);
-				        }
-				        return "总金额：" + sumBalance;
-				    }
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html b/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html
deleted file mode 100644
index b7b3903ec..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('组合表头')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-table table-bordered">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-		        columns : [
-        				[{
-        					title : '基本信息',
-        					align : 'center',
-        					colspan : 6
-        				}, {
-        					title : '其他信息',
-        					align : 'center',
-        					colspan : 3
-        				}
-        			],
-        			[{
-        					checkbox : true
-        				}, {
-        					field : 'userId',
-        					title : '用户ID'
-        				}, {
-        					field : 'userCode',
-        					title : '用户编号'
-        				}, {
-        					field : 'userName',
-        					title : '用户姓名'
-        				}, {
-        					field : 'userPhone',
-        					title : '用户手机'
-        				}, {
-        					field : 'userEmail',
-        					title : '用户邮箱'
-        				}, {
-        					field : 'userBalance',
-        					title : '用户余额'
-        				}, {
-        					field : 'status',
-        					title : '用户状态',
-        					formatter : function (value, row, index) {
-        						return $.table.selectDictLabel(datas, value);
-        					}
-        				}, {
-        					title : '操作',
-        					align : 'center',
-        					formatter : function (value, row, index) {
-        						var actions = [];
-        						actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-        						actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-        						return actions.join('');
-        					}
-        				}
-        			]
-        		]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/image.html b/ruoyi-admin/src/main/resources/templates/demo/table/image.html
deleted file mode 100644
index 0a8a2c486..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/image.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('跳转至指定页')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-				    title: '图片',
-				    formatter: function(value, row, index) {
-				    	// 图片自由组合
-				    	// 'img/profile.jpg' - 'http://ruoyi.vip/' 变成 http://ruoyi.vip/img/profile.jpg
-				    	// 'ruoyi.png' - 'http://ruoyi.vip/' 变成 http://ruoyi.vip/ruoyi.jpg
-				    	if(index % 2 == 0){
-				    		return $.table.imageView('img/profile.jpg', 'http://ruoyi.vip/');
-				    	}else {
-				    		return $.table.imageView('ruoyi.png', 'http://ruoyi.vip/');
-				    	}
-				    }
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/multi.html b/ruoyi-admin/src/main/resources/templates/demo/table/multi.html
deleted file mode 100644
index 43331e02b..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/multi.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('初始多表格')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table-1" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table-2" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-            	id: "bootstrap-table-1",
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-				exportUrl: prefix + "/export",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-        
-        function queryParams(params) {
-            var search = $.table.queryParams(params);
-            search.userName = '测试1';
-            return search;
-        }
-        
-        $(function() {
-            var options = {
-            	id: "bootstrap-table-2",
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-		        queryParams: queryParams,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/other.html b/ruoyi-admin/src/main/resources/templates/demo/table/other.html
deleted file mode 100644
index e9ed0ac49..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/other.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('其他操作')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-     	<div class="btn-group-sm" id="toolbar" role="group">
-	        <a class="btn btn-success" onclick="$.table.showColumn('userName')">
-	            <i class="fa fa-check"></i> 显示姓名
-	        </a>
-	        <a class="btn btn-danger" onclick="$.table.hideColumn('userName')">
-	            <i class="fa fa-close"></i> 隐藏姓名
-	        </a>
-	        <a class="btn btn-info" onclick="selectColumns()">
-	            <i class="fa fa-search"></i> 获取选中姓名
-	        </a>
-	        <a class="btn btn-warning" onclick="$.table.refresh()">
-	            <i class="fa fa-refresh"></i> 刷新
-	        </a>
-	        <a class="btn btn-danger" onclick="$.table.destroy()">
-	            <i class="fa fa-refresh"></i> 销毁
-	        </a>
-	        <a class="btn btn-primary" onclick="selectFirstColumns()">
-	            <i class="fa fa-search"></i> 获取选中首列值
-	        </a>
-        </div>
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-        
-        function selectColumns() {
-        	var column = $.table.selectColumns('userName');
-        	alert(column);
-        }
-        
-        function selectFirstColumns() {
-        	var column = $.table.selectFirstColumns();
-        	alert(column);
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/pageGo.html b/ruoyi-admin/src/main/resources/templates/demo/table/pageGo.html
deleted file mode 100644
index 9eab0de97..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/pageGo.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('跳转至指定页')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-		        showPageGo: true,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/params.html b/ruoyi-admin/src/main/resources/templates/demo/table/params.html
deleted file mode 100644
index 7193af190..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/params.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('自定义查询参数')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<p class="select-title">通过queryParams方法设置</p>
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-			
-			<div class="col-sm-12 search-collapse">
-				<form id="post-form">
-					<div class="select-list">
-						<ul>
-							<li>
-								用户姓名：<input type="text" name="userName" value="测试6"/>
-							</li>
-						</ul>
-					</div>
-				</form>
-			</div>
-			<div class="col-sm-12 select-table table-striped">
-				<p class="select-title">通过form自动填充</p>
-				<table id="bootstrap-table-form" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-		        queryParams: queryParams,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-        
-        function queryParams(params) {
-            var search = $.table.queryParams(params);
-            search.userName = '测试1';
-            return search;
-        }
-        
-        
-        $(function() {
-            var options = {
-            	id: "bootstrap-table-form",
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-                columns: [{
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/remember.html b/ruoyi-admin/src/main/resources/templates/demo/table/remember.html
deleted file mode 100644
index ca175863f..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/remember.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-	<th:block th:include="include :: header('翻页记住选择')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-     	<div class="btn-group-sm" id="toolbar" role="group">
-	        <a class="btn btn-success" onclick="checkItem()">
-	            <i class="fa fa-check"></i> 选中项
-	        </a>
-        </div>
-		<div class="row">
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table" data-mobile-responsive="true"></table>
-			</div>
-		</div>
-	</div>
-    <div th:include="include :: footer"></div>
-    <script th:inline="javascript">
-        var prefix = ctx + "demo/table";
-        var datas = [[${@dict.getType('sys_normal_disable')}]];
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-		        showSearch: false,
-		        showRefresh: false,
-		        showToggle: false,
-		        showColumns: false,
-		        rememberSelected: true,
-                columns: [{
-                	field: 'state',
-		            checkbox: true
-		        },
-				{
-					field : 'userId', 
-					title : '用户ID'
-				},
-				{
-					field : 'userCode', 
-					title : '用户编号'
-				},
-				{
-					field : 'userName', 
-					title : '用户姓名'
-				},
-				{
-					field : 'userPhone', 
-					title : '用户手机'
-				},
-				{
-					field : 'userEmail', 
-					title : '用户邮箱'
-				},
-				{
-				    field : 'userBalance',
-				    title : '用户余额'
-				},
-				{
-                    field: 'status',
-                    title: '用户状态',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                    	return $.table.selectDictLabel(datas, value);
-                    }
-                },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	var actions = [];
-		            	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
-						return actions.join('');
-		            }
-		        }]
-            };
-            $.table.init(options);
-        });
-        
-        // 选中数据
-        function checkItem(){
-        	var arrays = $.table.selectColumns("userId");
-        	alert(arrays);
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/search.html b/ruoyi-admin/src/main/resources/templates/demo/table/search.html
deleted file mode 100644
index 210b58b0b..000000000
--- a/ruoyi-admin/src/main/resources/templates/demo/table/search.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-	<th:block th:include="include :: header('表格搜索')" />
-	<th:block th:include="include :: bootstrap-select-css" />
-</head>
-<body class="gray-bg">
-    <div class="container-div">
-		<div class="row">
-			<div class="col-sm-12 search-collapse">
-			    <p class="select-title">普通条件查询</p>
-				<form id="ordinary-form">
-					<div class="select-list">
-						<ul>
-							<li>
-								商户编号：<input type="text" name="userId"/>
-							</li>
-							<li>
-								终端编号：<input type="text" name="termId"/>
-							</li>
-							<li>
-								处理状态：<select name="status">
-									<option value="">所有</option>
-									<option value="0">初始</option>
-									<option value="1">处理中</option>
-									<option value="2">交易成功</option>
-									<option value="3">交易失败</option>
-								</select>
-							</li>
-							<li>
-								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-							    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-							</li>
-						</ul>
-					</div>
-				</form>
-			</div>
-			
-			<div class="col-sm-12 search-collapse">
-			    <p class="select-title">时间条件查询</p>
-				<form id="time-form">
-					<div class="select-list">
-						<ul>
-							<li>
-								商户编号：<input type="text" name="userId"/>
-							</li>
-							<li>
-								终端编号：<input type="text" name="termId"/>
-							</li>
-							<li class="select-time">
-								<label>创建时间： </label>
-								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
-								<span>-</span>
-								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
-							</li>
-							<li>
-								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-							    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('time-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-							</li>
-						</ul>
-					</div>
-				</form>
-			</div>
-			
-			<div class="col-sm-12 search-collapse">
-			    <p class="select-title">下拉多选条件查询</p>
-				<form id="select-form">
-					<div class="select-list">
-						<ul>
-							<li>
-								商户编号：<input type="text" name="userId"/>
-							</li>
-							<li>
-								终端编号：<input type="text" name="termId"/>
-							</li>
-							<li class="select-selectpicker">
-								<label>操作类型： </label><select class="selectpicker" data-none-selected-text="请选择" multiple>
-									<option value="">所有</option>
-									<option value="0">初始</option>
-									<option value="1">处理中</option>
-									<option value="2">交易成功</option>
-									<option value="3">交易失败</option>
-								</select>
-							</li>
-							<li>
-								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-							    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('select-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-							</li>
-						</ul>
-					</div>
-				</form>
-			</div>
-			
-			<div class="col-sm-12 search-collapse">
-			    <p class="select-title">复杂条件查询</p>
-				<form id="complex-form">
-					<div class="select-list">
-						<ul>
-							<li>
-								<p>商户编号：</p>
-								<input type="text" name="userId"/>
-							</li>
-							<li>
-								<p>订单号：</p>
-								<input type="text" name="orderNo"/>
-							</li>
-							<li>
-								<p>日期：</p>
-								<input type="text" class="time-input" placeholder="日期"/>
-							</li>
-							<li class="select-selectpicker">
-								<p>状态：</p>
-								<select class="selectpicker" data-none-selected-text="请选择" multiple>
-									<option value="">所有</option>
-									<option value="0">初始</option>
-									<option value="1">处理中</option>
-									<option value="2">交易成功</option>
-									<option value="3">交易失败</option>
-								</select>
-							</li>
-							<li>
-								<p>供货商通道：</p>
-								<select>
-									<option value="">所有</option>
-									<option value="0">腾讯</option>
-									<option value="1">天猫</option>
-									<option value="2">京东</option>
-								</select>
-							</li>
-							<li>
-								<p>来源：</p>
-								<select>
-									<option value="">所有</option>
-									<option value="0">手机</option>
-									<option value="1">电脑</option>
-									<option value="2">第三方</option>
-								</select>
-							</li>
-							<li>
-								<p>运营商：</p>
-								<select>
-									<option value="">所有</option>
-									<option value="0">移动</option>
-									<option value="1">电信</option>
-									<option value="2">联通</option>
-								</select>
-							</li>
-							<li class="select-time">
-								<p>回调时间：</p>
-								<input type="text" class="time-input" placeholder="开始时间"/>
-								<span>-</span>
-								<input type="text" class="time-input" placeholder="结束时间"/>
-							</li>
-							
-							<li>
-								<a class="btn btn-primary btn-rounded btn-sm m50" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-							    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('complex-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-							</li>
-						</ul>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-	<th:block th:include="include :: footer" />
-	<th:block th:include="include :: bootstrap-select-js" />
-</body>
-</html>