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
index fb43aa73..f53537b6 100644
--- 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
@@ -46,6 +46,15 @@ public class DemoFormController
return prefix + "/select";
}
+ /**
+ * 时间轴
+ */
+ @GetMapping("/timeline")
+ public String timeline()
+ {
+ return prefix + "/timeline";
+ }
+
/**
* 表单校验
*/
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
index f2c16bc5..e8dc4c4a 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
@@ -573,14 +573,14 @@ label.error {
}
}
-/** 表单查询条件 **/
-.select-list ul {
+/** 表单查询条件 **/
+.select-list ul, .layui-layer-content ul {
margin: 0;
padding: 0;
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
-.select-list li {
+.select-list li, .layui-layer-content li {
list-style: none;
}
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/timeline.html b/ruoyi-admin/src/main/resources/templates/demo/form/timeline.html
new file mode 100644
index 00000000..0b0239e1
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/demo/form/timeline.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>时间轴</title>
+ <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
+ <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
+ <link href="../static/css/main/animate.min.css" th:href="@{/css/main/animate.min.css}" rel="stylesheet"/>
+ <link th:href="@{/css/style.css}" rel="stylesheet"/>
+</head>
+<body class="gray-bg">
+ <div class="row animated fadeInRight">
+ <div class="ibox float-e-margins">
+ <div class="text-center float-e-margins p-md">
+ <span>打开/关闭颜色/背景或方向版本: </span>
+ <a href="#" class="btn btn-xs btn-primary" id="lightVersion">轻型版本 </a>
+ <a href="#" class="btn btn-xs btn-primary" id="darkVersion">黑色版本 </a>
+ </div>
+ <div id="ibox-content">
+ <div id="vertical-timeline" class="vertical-container light-timeline">
+ <div class="vertical-timeline-block">
+ <div class="vertical-timeline-icon navy-bg">
+ <i class="fa fa-briefcase"></i>
+ </div>
+
+ <div class="vertical-timeline-content">
+ <h2>会议</h2>
+ <p>上一年的销售业绩发布会。总结产品营销和销售趋势及销售的现状。
+ </p>
+ <a href="#" class="btn btn-sm btn-primary"> 更多信息</a>
+ <span class="vertical-date">
+ 今天 <br>
+ <small>2月3日</small>
+ </span>
+ </div>
+ </div>
+
+ <div class="vertical-timeline-block">
+ <div class="vertical-timeline-icon blue-bg">
+ <i class="fa fa-file-text"></i>
+ </div>
+
+ <div class="vertical-timeline-content">
+ <h2>给张三发送文档</h2>
+ <p>发送上年度《销售业绩报告》</p>
+ <a href="#" class="btn btn-sm btn-success"> 下载文档 </a>
+ <span class="vertical-date">
+ 今天 <br>
+ <small>2月3日</small>
+ </span>
+ </div>
+ </div>
+
+ <div class="vertical-timeline-block">
+ <div class="vertical-timeline-icon lazur-bg">
+ <i class="fa fa-coffee"></i>
+ </div>
+
+ <div class="vertical-timeline-content">
+ <h2>喝咖啡休息</h2>
+ <p>喝咖啡啦，啦啦啦~~</p>
+ <a href="#" class="btn btn-sm btn-info">更多</a>
+ <span class="vertical-date"> 昨天 <br><small>2月2日</small></span>
+ </div>
+ </div>
+
+ <div class="vertical-timeline-block">
+ <div class="vertical-timeline-icon yellow-bg">
+ <i class="fa fa-phone"></i>
+ </div>
+
+ <div class="vertical-timeline-content">
+ <h2>给李四打电话</h2>
+ <p>给李四打电话分配本月工作任务</p>
+ <span class="vertical-date">昨天 <br><small>2月2日</small></span>
+ </div>
+ </div>
+
+ <div class="vertical-timeline-block">
+ <div class="vertical-timeline-icon lazur-bg">
+ <i class="fa fa-user-md"></i>
+ </div>
+
+ <div class="vertical-timeline-content">
+ <h2>公司年会</h2>
+ <p>发年终奖啦，啦啦啦~~</p>
+ <span class="vertical-date">前天 <br><small>2月1日</small></span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <th:block th:include="include :: footer" />
+ <script>
+ $(document).ready(function(){
+ $('#lightVersion').click(function(event) {
+ event.preventDefault()
+ $('#ibox-content').removeClass('ibox-content');
+ $('#vertical-timeline').removeClass('dark-timeline');
+ $('#vertical-timeline').addClass('light-timeline');
+ });
+ $('#darkVersion').click(function(event) {
+ event.preventDefault()
+ $('#ibox-content').addClass('ibox-content');
+ $('#vertical-timeline').removeClass('light-timeline');
+ $('#vertical-timeline').addClass('dark-timeline');
+ });
+ });
+ </script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index 74d7c69a..81752fd9 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -75,6 +75,7 @@
<li><a class="menuItem" th:href="@{/demo/form/button}">按钮</a></li>
<li><a class="menuItem" th:href="@{/demo/form/grid}">栅格</a></li>
<li><a class="menuItem" th:href="@{/demo/form/select}">下拉框</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/timeline}">时间轴</a></li>
<li><a class="menuItem" th:href="@{/demo/form/basic}">基本表单</a></li>
<li><a class="menuItem" th:href="@{/demo/form/cards}">卡片列表</a></li>
<li><a class="menuItem" th:href="@{/demo/form/jasny}">功能扩展</a></li>