记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit d472ce7c authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 0d71632b f4acd7bd
Show whitespace changes
Inline Side-by-side
Showing with 302 additions and 140 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformanceCalendarController.java
View file @ d472ce7c
...@@ -47,6 +47,7 @@ public class PerformanceCalendarController extends BaseController{ ...@@ -47,6 +47,7 @@ public class PerformanceCalendarController extends BaseController{
//获取开始结束间隔天数 //获取开始结束间隔天数
List<PerformanceCalendarResp> respList = this.getPerformanceList(performanceCalendarReq); List<PerformanceCalendarResp> respList = this.getPerformanceList(performanceCalendarReq);
mmap.put("currentDate",LocalDate.now());
mmap.put("requestParam",performanceCalendarReq); mmap.put("requestParam",performanceCalendarReq);
mmap.put("respDataList",respList); mmap.put("respDataList",respList);
return prefix + "/performanceCalendar"; return prefix + "/performanceCalendar";
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performanceCalendar/performanceCalendar.html
View file @ d472ce7c
...@@ -12,21 +12,11 @@ ...@@ -12,21 +12,11 @@
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li class="select-time"> <li class="select-time">
<!-- <label th:style="'width:120px'">请选择时间范围2： </label>--> <label th:style="'width:120px'">请选择时间范围： </label>
<!-- <input type="text" id="perStartTime" placeholder="开始日期" name="params[beginTime]"/>--> <input th:field="${requestParam.timeBegin}" type="text" class="input-sm form-control" id="perStartTime" placeholder="开始日期" name="timeBegin"/>
<!-- <span>-</span>-->
<!-- <input type="text" id="perEndTime" placeholder="结束日期" name="params[endTime]"/>-->
<label th:style="'width:120px'">请选择时间范围2： </label>
<input th:field="${requestParam.timeBegin}" type="text" class="input-sm form-control" id="perStartTime" placeholder="yyyy-MM-dd" name="timeBegin"/>
<span>-</span> <span>-</span>
<input th:field="${requestParam.timeEnd}" type="text" class="input-sm form-control" id="perEndTime" placeholder="yyyy-MM-dd" name="timeEnd" readonly/> <input th:field="${requestParam.timeEnd}" type="text" class="input-sm form-control" id="perEndTime" placeholder="结束日期" name="timeEnd" readonly/>
</li> </li>
<!-- <li>-->
<!-- <label th:style="'width:120px'">请选择时间范围： </label>-->
<!-- <input type="text" id="perStartTime" placeholder="开始日期" name="params[beginTime]"/>-->
<!-- <span>-</span>-->
<!-- <input type="text" id="perEndTime" placeholder="结束日期" name="params[endTime]"/>-->
<!-- </li>-->
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="submit()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="submit()"><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> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
...@@ -35,176 +25,210 @@ ...@@ -35,176 +25,210 @@
</div> </div>
</form> </form>
</div> </div>
<div class="comments-top-top"> <div class="el-calendar">
<div class="top-comment-left"> <div class="el-calendar__header">
<div class="el-calendar__title" th:text="${currentDate}">
</div>
</div> </div>
<table id="bootstrap-table2" class="table table-bordered table-hover"> <div>
<thead class=""> <div class="el-calendar__body">
<tr> <table id="bootstrap-table2" cellspacing="0" cellpadding="0" class="el-calendar-table is-range">
<th style="" data-field="mon"> <thead>
<div class="th-inner ">Mon</div> <th>Mon</th>
<div class="fht-cell"></div> <th>Tue</th>
</th> <th>Wed</th>
<th style="" data-field="tue"> <th>Thu</th>
<div class="th-inner ">Tue</div> <th>Fri</th>
<div class="fht-cell"></div> <th>Sat</th>
</th> <th>Sun</th>
<th style="" data-field="wed">
<div class="th-inner ">Wed</div>
<div class="fht-cell"></div>
</th>
<th style="" data-field="thu">
<div class="th-inner ">Thu</div>
<div class="fht-cell"></div>
</th>
<th style="" data-field="fri">
<div class="th-inner ">Fri</div>
<div class="fht-cell"></div>
</th>
<th style="" data-field="sat">
<div class="th-inner ">Sat</div>
<div class="fht-cell"></div>
</th>
<th style="" data-field="sun">
<div class="th-inner ">Sun</div>
<div class="fht-cell"></div>
</th>
</tr>
</thead> </thead>
<tbody th:each="respBean,respBeanStat:${respDataList}"> <tbody th:each="respBean,respBeanStat:${respDataList}">
<tr> <tr class="el-calendar-table__row">
<td> <td>
<div th:text="${respBean.monDate}"></div> <div th:text="${respBean.monDate}" class="el-calendar-day"></div>
<th:block th:if="${#lists.size(respBean.monList)} gt 0"> <th:block th:if="${#lists.size(respBean.monList)} gt 0">
<div th:each="performanceVo:${respBean.monList}"> <div th:each="performanceVo:${respBean.monList}" class="calendar-data">
<ul> <div>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li> <div>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li> <div class="city">
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li> <button type="button" class="el-button el-button--primary el-button--mini is-plain">
</ul> <span th:text="*{performanceVo.cityName}">
</span>
</button>
[[*{performanceVo.timeStart}]]
</div>
<div class="title" th:text="*{performanceVo.title}">
</div>
</div>
</div>
</div> </div>
</th:block> </th:block>
<th:block th:if="${#lists.size(respBean.monList)} eq 0"> <th:block th:if="${#lists.size(respBean.monList)} eq 0">
<div class="calendar-data">
<div> <div>
<ul> <div th:text="无演出" style="text-align: center"></div>
<li><span class="left-at" th:text="无演出"/></li> </div>
</ul>
</div> </div>
</th:block> </th:block>
</td> </td>
<td> <td>
<div th:text="${respBean.tueDate}"></div> <div th:text="${respBean.tueDate}" class="el-calendar-day"></div>
<th:block th:if="${#lists.size(respBean.tueList)} gt 0"> <th:block th:if="${#lists.size(respBean.tueList)} gt 0">
<div th:each="performanceVo:${respBean.tueList}"> <div th:each="performanceVo:${respBean.tueList}" class="calendar-data">
<ul> <div>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li> <div>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li> <div class="city">
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li> <button type="button" class="el-button el-button--primary el-button--mini is-plain">
</ul> <span th:text="*{performanceVo.cityName}">
</span>
</button>
[[*{performanceVo.timeStart}]]
</div>
<div class="title" th:text="*{performanceVo.title}">
</div>
</div>
</div>
</div> </div>
</th:block> </th:block>
<th:block th:if="${#lists.size(respBean.tueList)} eq 0"> <th:block th:if="${#lists.size(respBean.tueList)} eq 0">
<div class="calendar-data">
<div> <div>
<ul> <div th:text="无演出" style="text-align: center"></div>
<li><span class="left-at" th:text="无演出"/></li> </div>
</ul>
</div> </div>
</th:block> </th:block>
</td> </td>
<td> <td>
<div th:text="${respBean.wedDate}"></div> <div th:text="${respBean.wedDate}" class="el-calendar-day"></div>
<th:block th:if="${#lists.size(respBean.wedList)} gt 0"> <th:block th:if="${#lists.size(respBean.wedList)} gt 0">
<div th:each="performanceVo:${respBean.wedList}"> <div th:each="performanceVo:${respBean.wedList}" class="calendar-data">
<ul> <div>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li> <div>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li> <div class="city">
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li> <button type="button" class="el-button el-button--primary el-button--mini is-plain">
</ul> <span th:text="*{performanceVo.cityName}">
</span>
</button>
[[*{performanceVo.timeStart}]]
</div>
<div class="title" th:text="*{performanceVo.title}">
</div>
</div>
</div>
</div> </div>
</th:block> </th:block>
<th:block th:if="${#lists.size(respBean.wedList)} eq 0"> <th:block th:if="${#lists.size(respBean.wedList)} eq 0">
<div class="calendar-data">
<div> <div>
<ul> <div th:text="无演出" style="text-align: center"></div>
<li><span class="left-at" th:text="无演出"/></li> </div>
</ul>
</div> </div>
</th:block> </th:block>
</td> </td>
<td> <td>
<div th:text="${respBean.thuDate}"></div> <div th:text="${respBean.thuDate}" class="el-calendar-day"></div>
<th:block th:if="${#lists.size(respBean.thuList)} gt 0"> <th:block th:if="${#lists.size(respBean.thuList)} gt 0">
<div th:each="performanceVo:${respBean.thuList}"> <div th:each="performanceVo:${respBean.thuList}" class="calendar-data">
<ul> <div>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li> <div>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li> <div class="city">
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li> <button type="button" class="el-button el-button--primary el-button--mini is-plain">
</ul> <span th:text="*{performanceVo.cityName}">
</span>
</button>
[[*{performanceVo.timeStart}]]
</div>
<div class="title" th:text="*{performanceVo.title}">
</div>
</div>
</div>
</div> </div>
</th:block> </th:block>
<th:block th:if="${#lists.size(respBean.thuList)} eq 0"> <th:block th:if="${#lists.size(respBean.thuList)} eq 0">
<div class="calendar-data">
<div> <div>
<ul> <div th:text="无演出" style="text-align: center"></div>
<li><span class="left-at" th:text="无演出"/></li> </div>
</ul>
</div> </div>
</th:block> </th:block>
</td> </td>
<td> <td>
<div th:text="${respBean.friDate}"></div> <div th:text="${respBean.friDate}" class="el-calendar-day"></div>
<th:block th:if="${#lists.size(respBean.friList)} gt 0"> <th:block th:if="${#lists.size(respBean.friList)} gt 0">
<div th:each="performanceVo:${respBean.friList}"> <div th:each="performanceVo:${respBean.friList}" class="calendar-data">
<ul> <div>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li> <div>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li> <div class="city">
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li> <button type="button" class="el-button el-button--primary el-button--mini is-plain">
</ul> <span th:text="*{performanceVo.cityName}">
</span>
</button>
[[*{performanceVo.timeStart}]]
</div>
<div class="title" th:text="*{performanceVo.title}">
</div>
</div>
</div>
</div> </div>
</th:block> </th:block>
<th:block th:if="${#lists.size(respBean.friList)} eq 0"> <th:block th:if="${#lists.size(respBean.tueList)} eq 0">
<div class="calendar-data">
<div> <div>
<ul> <div th:text="无演出" style="text-align: center"></div>
<li><span class="left-at" th:text="无演出"/></li> </div>
</ul>
</div> </div>
</th:block> </th:block>
</td> </td>
<td> <td>
<div th:text="${respBean.satDate}"></div> <div th:text="${respBean.satDate}" class="el-calendar-day"></div>
<th:block th:if="${#lists.size(respBean.satList)} gt 0"> <th:block th:if="${#lists.size(respBean.satList)} gt 0">
<div th:each="performanceVo:${respBean.satList}"> <div th:each="performanceVo:${respBean.satList}" class="calendar-data">
<ul> <div>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li> <div>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li> <div class="city">
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li> <button type="button" class="el-button el-button--primary el-button--mini is-plain">
</ul> <span th:text="*{performanceVo.cityName}">
</span>
</button>
[[*{performanceVo.timeStart}]]
</div>
<div class="title" th:text="*{performanceVo.title}">
</div>
</div>
</div>
</div> </div>
</th:block> </th:block>
<th:block th:if="${#lists.size(respBean.satList)} eq 0"> <th:block th:if="${#lists.size(respBean.satList)} eq 0">
<div class="calendar-data">
<div> <div>
<ul> <div th:text="无演出" style="text-align: center"></div>
<li><span class="left-at" th:text="无演出"/></li> </div>
</ul>
</div> </div>
</th:block> </th:block>
</td> </td>
<td> <td>
<div th:text="${respBean.sunDate}"></div> <div th:text="${respBean.sunDate}" class="el-calendar-day"></div>
<th:block th:if="${#lists.size(respBean.sunList)} gt 0"> <th:block th:if="${#lists.size(respBean.sunList)} gt 0">
<div th:each="performanceVo:${respBean.sunList}"> <div th:each="performanceVo:${respBean.sunList}" class="calendar-data">
<ul> <div>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li> <div>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li> <div class="city">
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li> <button type="button" class="el-button el-button--primary el-button--mini is-plain">
</ul> <span th:text="*{performanceVo.cityName}">
</span>
</button>
[[*{performanceVo.timeStart}]]
</div>
<div class="title" th:text="*{performanceVo.title}">
</div>
</div>
</div>
</div> </div>
</th:block> </th:block>
<th:block th:if="${#lists.size(respBean.sunList)} eq 0"> <th:block th:if="${#lists.size(respBean.sunList)} eq 0">
<div class="calendar-data">
<div> <div>
<ul> <div th:text="无演出" style="text-align: center"></div>
<li><span class="left-at" th:text="无演出"/></li> </div>
</ul>
</div> </div>
</th:block> </th:block>
</td> </td>
...@@ -212,6 +236,7 @@ ...@@ -212,6 +236,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<!-- <div class="col-sm-12 select-table table-bordered">--> <!-- <div class="col-sm-12 select-table table-bordered">-->
<!-- <table id="bootstrap-table"></table>--> <!-- <table id="bootstrap-table"></table>-->
<!-- </div>--> <!-- </div>-->
...@@ -268,8 +293,8 @@ ...@@ -268,8 +293,8 @@
title: 'Mon' title: 'Mon'
}, },
{ {
field: 'tue', field: 'thu',
title: 'Tue' title: 'thu'
}, },
{ {
field: 'wed', field: 'wed',
...@@ -392,17 +417,110 @@ ...@@ -392,17 +417,110 @@
// //
// }); // });
</script> </script>
</body>
<style lang="scss"> <style lang="scss">
.sline { /*html {*/
margin: 10px 0 20px; /* line-height: 1.15;*/
border-top: 1px dashed #d7dbe2; /* -ms-text-size-adjust: 100%;*/
/* -webkit-text-size-adjust: 100%;*/
/*}*/
/*body {*/
/* height: 100%;*/
/* -moz-osx-font-smoothing: grayscale;*/
/* -webkit-font-smoothing: antialiased;*/
/* text-rendering: optimizeLegibility;*/
/* font-family: Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Arial,sans-serif;*/
/*}*/
.el-calendar {
background-color: #fff
}
.el-calendar__header {
display: flex;
justify-content: space-between;
padding: 12px 20px;
border-bottom: 1px solid #dfe6ec;
margin:auto;
vertical-align: top;
}
.el-calendar__title {
color: #000;
align-self: center
}
.el-calendar__body {
padding: 12px 20px 35px
}
.el-calendar-table {
table-layout: fixed;
width: 100%
}
.el-calendar-table thead th {
padding: 12px 0;
color: #606266;
font-weight: 400;
background-color: #f2f8fe;
text-align: center;
height: 30px;
font-size: 14px;
}
.el-calendar-table:not(.is-range) td.next, .el-calendar-table:not(.is-range) td.prev {
color: #c0c4cc
} }
.calendar-day{
.el-calendar-table td {
border-bottom: 1px solid #dfe6ec;
border-right: 1px solid #dfe6ec;
vertical-align: top;
transition: background-color .2s ease
}
.el-calendar-table td.is-selected {
background-color: #f2f8fe
}
.el-calendar-table td.is-today {
color: #1890ff
}
.el-calendar-table tr:first-child td {
border-top: 1px solid #dfe6ec
}
.el-calendar-table tr td:first-child {
border-left: 1px solid #dfe6ec
}
.el-calendar-table tr.el-calendar-table__row--hide-border td {
border-top: none
}
.el-calendar__body .el-calendar-table{
box-sizing: border-box;
padding: 8px;
height: 85px
}
.el-calendar-table .el-calendar-day{
text-align: center;
height: 30px;
font-size: 14px;
}
.el-calendar-table .el-calendar-day:hover {
cursor: pointer;
background-color: #f2f8fe;
text-align: center; text-align: center;
height: 30px; height: 30px;
font-size: 14px; font-size: 14px;
} }
.sline {
margin: 10px 0 20px;
border-top: 1px dashed #d7dbe2;
}
.calendar-data { .calendar-data {
font-size: 12px; font-size: 12px;
} }
...@@ -421,5 +539,48 @@ ...@@ -421,5 +539,48 @@
color: #409EFF; color: #409EFF;
font-size: 14px; font-size: 14px;
} }
.el-button--primary.is-plain {
color: #1890ff;
background: #e8f4ff;
border-color: #a3d3ff;
}
[type=reset], [type=submit], button, html [type=button] {
-webkit-appearance: button;
}
.el-button--mini {
padding: 7px 15px;
font-size: 12px;
border-radius: 3px;
}
.el-button--primary {
color: #fff;
background-color: #1890ff;
border-color: #1890ff;
}
.el-button {
display: inline-block;
line-height: 1;
white-space: nowrap;
cursor: pointer;
background: #fff;
border: 1px solid #dcdfe6;
border-color: #dcdfe6;
color: #606266;
-webkit-appearance: none;
text-align: center;
box-sizing: border-box;
outline: none;
margin: 0;
transition: .1s;
font-weight: 400;
-moz-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
padding: 12px 20px;
font-size: 14px;
border-radius: 4px;
}
</style> </style>
</body>
</html> </html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment